Index: tests/.expect/alloc-ERROR.txt
===================================================================
--- tests/.expect/alloc-ERROR.txt	(revision a109bb47c880eba8f7f5e931fee394306ead0435)
+++ tests/.expect/alloc-ERROR.txt	(revision 07ec1a266e4ed6bb2fdcd15a073ce16d98d5ea51)
@@ -1,17 +1,17 @@
-alloc.cfa:265:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.cfa:265:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
-...to: 
+...to:
   Name: p
-  Applying untyped: 
+  Applying untyped:
     Name: realloc
-  ...to: 
+  ...to:
     Name: stp
-    Applying untyped: 
+    Applying untyped:
       Name: ?*?
-    ...to: 
+    ...to:
       Name: dim
-      Sizeof Expression on: Applying untyped: 
+      Sizeof Expression on: Applying untyped:
           Name: *?
-        ...to: 
+        ...to:
           Name: stp
 
@@ -19,19 +19,19 @@
 
 
-alloc.cfa:266:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.cfa:266:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
-...to: 
+...to:
   Name: p
-  Applying untyped: 
+  Applying untyped:
     Name: alloc
-  ...to: 
+  ...to:
     Name: stp
-    Applying untyped: 
+    Applying untyped:
       Name: ?*?
-    ...to: 
+    ...to:
       Name: dim
-      Sizeof Expression on: Applying untyped: 
+      Sizeof Expression on: Applying untyped:
           Name: *?
-        ...to: 
+        ...to:
           Name: stp
 
@@ -39,22 +39,22 @@
 
 
-alloc.cfa:267:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.cfa:267:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
-...to: 
+...to:
   Name: p
-  Applying untyped: 
+  Applying untyped:
     Name: memset
-  ...to: 
+  ...to:
     Name: stp
     constant expression (10 10: signed int)
 
 
-alloc.cfa:268:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.cfa:268:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
-...to: 
+...to:
   Name: p
-  Applying untyped: 
+  Applying untyped:
     Name: memcpy
-  ...to: 
+  ...to:
     Address of:
       Name: st1
Index: tests/.expect/completeTypeError.txt
===================================================================
--- tests/.expect/completeTypeError.txt	(revision a109bb47c880eba8f7f5e931fee394306ead0435)
+++ tests/.expect/completeTypeError.txt	(revision 07ec1a266e4ed6bb2fdcd15a073ce16d98d5ea51)
@@ -1,45 +1,45 @@
-completeTypeError.cfa:33:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.cfa:33:1 error: No reasonable alternatives for expression Applying untyped:
   Name: *?
-...to: 
+...to:
   Name: v
 
-completeTypeError.cfa:34:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.cfa:34:1 error: No reasonable alternatives for expression Applying untyped:
   Name: *?
-...to: 
+...to:
   Name: y
 
-completeTypeError.cfa:35:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.cfa:35:1 error: No reasonable alternatives for expression Applying untyped:
   Name: foo
-...to: 
+...to:
   Name: v
 
-completeTypeError.cfa:36:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.cfa:36:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
-...to: 
+...to:
   Name: v
 
-completeTypeError.cfa:37:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.cfa:37:1 error: No reasonable alternatives for expression Applying untyped:
   Name: quux
-...to: 
+...to:
   Name: v
 
-completeTypeError.cfa:58:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.cfa:58:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
-...to: 
+...to:
   Name: y
 
-completeTypeError.cfa:59:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.cfa:59:1 error: No reasonable alternatives for expression Applying untyped:
   Name: quux
-...to: 
+...to:
   Name: y
 
-completeTypeError.cfa:60:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.cfa:60:1 error: No reasonable alternatives for expression Applying untyped:
   Name: *?
-...to: 
+...to:
   Name: y
 
-completeTypeError.cfa:72:1 error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.cfa:72:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
-...to: 
+...to:
   Name: z
 
Index: tests/.expect/declarationErrors.txt
===================================================================
--- tests/.expect/declarationErrors.txt	(revision a109bb47c880eba8f7f5e931fee394306ead0435)
+++ tests/.expect/declarationErrors.txt	(revision 07ec1a266e4ed6bb2fdcd15a073ce16d98d5ea51)
@@ -6,13 +6,13 @@
 
 declarationErrors.cfa:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
-  with members 
+  with members
     i: int 
-   with body 
+   with body
 
 
 declarationErrors.cfa:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
-  with members 
+  with members
     i: int 
-   with body 
+   with body
 
 
@@ -20,50 +20,50 @@
 
 declarationErrors.cfa:24:1 error: duplicate const in declaration of f01: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:25:1 error: duplicate volatile in declaration of f02: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:26:1 error: duplicate const in declaration of f03: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:27:1 error: duplicate volatile in declaration of f04: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:28:1 error: duplicate const in declaration of f05: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:29:1 error: duplicate volatile in declaration of f06: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:30:1 error: duplicate const in declaration of f07: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
-  with no parameters 
+  with no parameters
   returning const volatile int 
 
 
 declarationErrors.cfa:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
-  with no parameters 
+  with no parameters
   returning const restrict volatile _Atomic int 
 
Index: tests/.expect/nested-types-ERR2.txt
===================================================================
--- tests/.expect/nested-types-ERR2.txt	(revision a109bb47c880eba8f7f5e931fee394306ead0435)
+++ tests/.expect/nested-types-ERR2.txt	(revision 07ec1a266e4ed6bb2fdcd15a073ce16d98d5ea51)
@@ -1,6 +1,6 @@
 nested-types.cfa:73:1 error: Use of undefined global type Z
 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 type Z (not function type) 
+nested-types.cfa:75:1 error: Undefined type in qualified type: Qualified Type:
+  instance of struct S with body 1
+  instance of type Z (not function type)