Index: tests/array-container/.expect/language-dim-mismatch.nast.txt
===================================================================
--- tests/array-container/.expect/language-dim-mismatch.nast.txt	(revision bfd551277c04ecd8721e431ae84ab67dfad0fd2b)
+++ tests/array-container/.expect/language-dim-mismatch.nast.txt	(revision bfd551277c04ecd8721e431ae84ab67dfad0fd2b)
@@ -0,0 +1,10 @@
+array-container/language-dim-mismatch.cfa:12:1 error: Type argument given for value parameter: instance of struct SN with body
+... with parameters
+  float
+
+array-container/language-dim-mismatch.cfa:13:1 error: Expression argument given for type parameter: instance of struct ST with body
+... with parameters
+  Constant Expression (42: signed int)
+  ... with resolved type:
+    signed int
+
Index: tests/array-container/.expect/language-dim-mismatch.oast.txt
===================================================================
--- tests/array-container/.expect/language-dim-mismatch.oast.txt	(revision bfd551277c04ecd8721e431ae84ab67dfad0fd2b)
+++ tests/array-container/.expect/language-dim-mismatch.oast.txt	(revision bfd551277c04ecd8721e431ae84ab67dfad0fd2b)
@@ -0,0 +1,10 @@
+array-container/language-dim-mismatch.cfa:12:1 error: Type argument given for value parameter: instance of struct SN with body 1
+... with parameters
+  float
+
+array-container/language-dim-mismatch.cfa:13:1 error: Expression argument given for type parameter: instance of struct ST with body 1
+... with parameters
+  constant expression (42 42: signed int)
+  with resolved type:
+    signed int
+
Index: tests/array-container/.expect/language-dim-mismatch.txt
===================================================================
--- tests/array-container/.expect/language-dim-mismatch.txt	(revision 30d91e4132fb7ec560dd389474deafbfd0d57555)
+++ 	(revision )
@@ -1,10 +1,0 @@
-array-container/language-dim-mismatch.cfa:12:1 error: Type argument given for value parameter: instance of struct SN with body 1
-... with parameters
-  float
-
-array-container/language-dim-mismatch.cfa:13:1 error: Expression argument given for type parameter: instance of struct ST with body 1
-... with parameters
-  constant expression (42 42: signed int)
-  with resolved type:
-    signed int
-
Index: tests/errors/.expect/scope.nast.txt
===================================================================
--- tests/errors/.expect/scope.nast.txt	(revision bfd551277c04ecd8721e431ae84ab67dfad0fd2b)
+++ tests/errors/.expect/scope.nast.txt	(revision bfd551277c04ecd8721e431ae84ab67dfad0fd2b)
@@ -0,0 +1,9 @@
+errors/scope.cfa:2:1 error: duplicate object definition for thisIsAnError: signed int
+errors/scope.cfa:20:1 error: duplicate function definition for butThisIsAnError: function
+... with parameters
+  double
+... returning
+  double
+ with body
+  Compound Statement:
+
Index: tests/errors/.expect/scope.oast.txt
===================================================================
--- tests/errors/.expect/scope.oast.txt	(revision bfd551277c04ecd8721e431ae84ab67dfad0fd2b)
+++ tests/errors/.expect/scope.oast.txt	(revision bfd551277c04ecd8721e431ae84ab67dfad0fd2b)
@@ -0,0 +1,12 @@
+errors/scope.cfa:2:1 error: duplicate object definition for thisIsAnError: signed int
+errors/scope.cfa:20:1 error: duplicate function definition for butThisIsAnError: function
+... with parameters
+  double
+... returning
+  _retval_butThisIsAnError: double
+  ... with attributes:
+    Attribute with name: unused
+
+... with body
+  CompoundStmt
+
Index: tests/errors/.expect/scope.txt
===================================================================
--- tests/errors/.expect/scope.txt	(revision 30d91e4132fb7ec560dd389474deafbfd0d57555)
+++ 	(revision )
@@ -1,9 +1,0 @@
-errors/scope.cfa:2:1 error: duplicate object definition for thisIsAnError: signed int
-errors/scope.cfa:20:1 error: duplicate function definition for butThisIsAnError: function
-... with parameters
-  double
-... returning
-  double
- with body
-  Compound Statement:
-