Index: tests/warnings/.expect/self-assignment.nast.txt
===================================================================
--- tests/warnings/.expect/self-assignment.nast.txt	(revision 53e28a7af62530b2f28ba50d873f505b91ea01c1)
+++ tests/warnings/.expect/self-assignment.nast.txt	(revision 4a359e27328989a7e80d0af8bd15c0f8bbebf42b)
@@ -4,12 +4,12 @@
   reference to signed int
 warnings/self-assignment.cfa:30:1 warning: self assignment of expression: Generated Cast of:
-  Variable Expression: s: instance of struct S with body 1
+  Variable Expression: s: instance of struct S with body
 ... to:
-  reference to instance of struct S with body 1
+  reference to instance of struct S with body
 warnings/self-assignment.cfa:31:1 warning: self assignment of expression: Generated Cast of:
   Member Expression, with field:
     i: signed int
   ... from aggregate:
-    Variable Expression: s: instance of struct S with body 1
+    Variable Expression: s: instance of struct S with body
 ... to:
   reference to signed int
@@ -19,7 +19,7 @@
   ... from aggregate:
     Member Expression, with field:
-      s: instance of struct S with body 1
+      s: instance of struct S with body
     ... from aggregate:
-      Variable Expression: t: instance of struct T with body 1
+      Variable Expression: t: instance of struct T with body
 ... to:
   reference to signed int