Index: tests/.expect/completeTypeError.txt
===================================================================
--- tests/.expect/completeTypeError.txt	(revision e99e43f290a67032231db42a3e1c62f8c7ba7ca7)
+++ tests/.expect/completeTypeError.txt	(revision d97c3a4b9cfd1040061ab2ac4708294336c5404b)
@@ -45,5 +45,5 @@
 
 Alternatives with failing assertions are:
-Cost ( 0, 1, 1, -5, 0, 0 ): Application of
+Cost ( 0, 1, 0, 1, -5, 0 ): Application of
      Variable Expression: baz: forall
        T: sized object type
@@ -53,7 +53,7 @@
            reference to instance of type T (not function type) 
            instance of type T (not function type) 
-         ... returning 
+         ... returning
            _retval__operator_assign: instance of type T (not function type) 
-           ... with attributes: 
+           ... with attributes:
              Attribute with name: unused
 
@@ -62,5 +62,5 @@
          ... with parameters
            reference to instance of type T (not function type) 
-         ... returning nothing 
+         ... returning nothing
 
          ?{}: pointer to function
@@ -68,10 +68,10 @@
            reference to instance of type T (not function type) 
            instance of type T (not function type) 
-         ... returning nothing 
+         ... returning nothing
 
          ^?{}: pointer to function
          ... with parameters
            reference to instance of type T (not function type) 
-         ... returning nothing 
+         ... returning nothing
 
 
@@ -79,5 +79,5 @@
      ... with parameters
        pointer to instance of type T (not function type) 
-     ... returning nothing 
+     ... returning nothing
 
    ... to arguments
@@ -87,5 +87,5 @@
    void 
  )
- Environment: ( _73_0_T ) -> instance of type T (not function type)  (no widening)
+ Environment:( _73_0_T ) -> instance of type T (not function type)  (no widening)
 
 
Index: tests/.expect/nested-types-ERR2.txt
===================================================================
--- tests/.expect/nested-types-ERR2.txt	(revision e99e43f290a67032231db42a3e1c62f8c7ba7ca7)
+++ tests/.expect/nested-types-ERR2.txt	(revision d97c3a4b9cfd1040061ab2ac4708294336c5404b)
@@ -2,5 +2,5 @@
 nested-types.cfa:74:1 error: Qualified type requires an aggregate on the left, but has: signed int
 nested-types.cfa:75:1 error: Undefined type in qualified type: Qualified Type: 
-  instance of struct S with body 1 
+  instance of struct S with body 1
   instance of type Z (not function type)