Index: tests/.expect/typedefRedef-ERR1.txt
===================================================================
--- tests/.expect/typedefRedef-ERR1.txt	(revision 3e49c477928665a719e7a4c1179ab4364aae22de)
+++ tests/.expect/typedefRedef-ERR1.txt	(revision ca9d65e54b7ed187b75dfe016b8d4e2debd19fa4)
@@ -1,4 +1,4 @@
 typedefRedef.cfa:75:25: warning: Compiled
-typedefRedef.cfa:4:1 error: Cannot redefine typedef: Foo
-typedefRedef.cfa:31:1 error: Cannot redefine typedef: ARR
-typedefRedef.cfa:65:1 error: Cannot redefine typedef: ARR
+typedefRedef.cfa:4:1 error: Cannot redefine typedef Foo
+typedefRedef.cfa:31:1 error: Cannot redefine typedef ARR
+typedefRedef.cfa:65:1 error: Cannot redefine typedef ARR
Index: tests/concurrency/.expect/ctor-check.txt
===================================================================
--- tests/concurrency/.expect/ctor-check.txt	(revision 3e49c477928665a719e7a4c1179ab4364aae22de)
+++ tests/concurrency/.expect/ctor-check.txt	(revision ca9d65e54b7ed187b75dfe016b8d4e2debd19fa4)
@@ -1,4 +1,3 @@
-concurrency/ctor-check.cfa:11:1 error: constructors cannot have mutex parameters
-?{}: function
+concurrency/ctor-check.cfa:11:1 error: constructors cannot have mutex parameters ?{}: function
 ... with parameters
   this: mutex reference to instance of struct Empty with body
Index: tests/exceptions/.expect/try-ctrl-flow.txt
===================================================================
--- tests/exceptions/.expect/try-ctrl-flow.txt	(revision 3e49c477928665a719e7a4c1179ab4364aae22de)
+++ tests/exceptions/.expect/try-ctrl-flow.txt	(revision ca9d65e54b7ed187b75dfe016b8d4e2debd19fa4)
@@ -1,18 +1,18 @@
-exceptions/try-ctrl-flow.cfa:7:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:15:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:23:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:31:1 error: 'continue' target must be an enclosing loop: 
-exceptions/try-ctrl-flow.cfa:48:1 error: 'break' target must be an enclosing control structure: mainLoop
-exceptions/try-ctrl-flow.cfa:56:1 error: 'continue' target must be an enclosing loop: mainLoop
-exceptions/try-ctrl-flow.cfa:65:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:76:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:87:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
-exceptions/try-ctrl-flow.cfa:98:1 error: 'break' target must be an enclosing control structure: mainBlock
-exceptions/try-ctrl-flow.cfa:111:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
-exceptions/try-ctrl-flow.cfa:124:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
-exceptions/try-ctrl-flow.cfa:133:1 error: 'return' may not appear in a finally clause
-exceptions/try-ctrl-flow.cfa:139:1 error: 'return' may not appear in a finally clause
-exceptions/try-ctrl-flow.cfa:148:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:159:1 error: 'return' may not appear in a try statement with a catch clause
-exceptions/try-ctrl-flow.cfa:187:1 error: 'return' may not appear in a catch clause
-exceptions/try-ctrl-flow.cfa:195:1 error: 'return' may not appear in a catchResume clause
+exceptions/try-ctrl-flow.cfa:7:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:15:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:23:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:31:1 error: "continue" target must be an enclosing loop: 
+exceptions/try-ctrl-flow.cfa:48:1 error: "break" target must be an enclosing control structure: mainLoop
+exceptions/try-ctrl-flow.cfa:56:1 error: "continue" target must be an enclosing loop: mainLoop
+exceptions/try-ctrl-flow.cfa:65:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:76:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:87:1 error: "fallthrough" must be enclosed in a "switch" or "choose"
+exceptions/try-ctrl-flow.cfa:98:1 error: "break" target must be an enclosing control structure: mainBlock
+exceptions/try-ctrl-flow.cfa:111:1 error: "fallthrough" must be enclosed in a "switch" or "choose"
+exceptions/try-ctrl-flow.cfa:124:1 error: "fallthrough" must be enclosed in a "switch" or "choose"
+exceptions/try-ctrl-flow.cfa:133:1 error: "return" may not appear in a finally clause
+exceptions/try-ctrl-flow.cfa:139:1 error: "return" may not appear in a finally clause
+exceptions/try-ctrl-flow.cfa:148:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:159:1 error: "return" may not appear in a try statement with a catch clause
+exceptions/try-ctrl-flow.cfa:187:1 error: "return" may not appear in a catch clause
+exceptions/try-ctrl-flow.cfa:195:1 error: "return" may not appear in a catchResume clause
Index: tests/raii/.expect/dtor-early-exit-ERR1.txt
===================================================================
--- tests/raii/.expect/dtor-early-exit-ERR1.txt	(revision 3e49c477928665a719e7a4c1179ab4364aae22de)
+++ tests/raii/.expect/dtor-early-exit-ERR1.txt	(revision ca9d65e54b7ed187b75dfe016b8d4e2debd19fa4)
@@ -1,4 +1,1 @@
-raii/dtor-early-exit.cfa:150:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
-  with target: L1
-  with original target: L1
-
+raii/dtor-early-exit.cfa:150:1 error: jump to label "L1" crosses initialization of "y".
Index: tests/raii/.expect/dtor-early-exit-ERR2.txt
===================================================================
--- tests/raii/.expect/dtor-early-exit-ERR2.txt	(revision 3e49c477928665a719e7a4c1179ab4364aae22de)
+++ tests/raii/.expect/dtor-early-exit-ERR2.txt	(revision ca9d65e54b7ed187b75dfe016b8d4e2debd19fa4)
@@ -1,4 +1,1 @@
-raii/dtor-early-exit.cfa:214:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
-  with target: L2
-  with original target: L2
-
+raii/dtor-early-exit.cfa:214:1 error: jump to label "L2" crosses initialization of "y".