Index: tests/concurrent/.expect/keywordErrors.nast.txt
===================================================================
--- tests/concurrent/.expect/keywordErrors.nast.txt	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
+++ 	(revision )
@@ -1,6 +1,0 @@
-concurrent/keywordErrors.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-thread A with body
-
-concurrent/keywordErrors.cfa:6:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-thread B with body
-
Index: tests/concurrent/.expect/keywordErrors.oast.txt
===================================================================
--- tests/concurrent/.expect/keywordErrors.oast.txt	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
+++ 	(revision )
@@ -1,6 +1,0 @@
-concurrent/keywordErrors.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-thread A: with body 1
-
-concurrent/keywordErrors.cfa:6:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-thread B: with body 1
-
Index: tests/concurrent/.expect/keywordErrors.txt
===================================================================
--- tests/concurrent/.expect/keywordErrors.txt	(revision c87b6043f3954c3bc70ede6f6fc0593d735783ae)
+++ tests/concurrent/.expect/keywordErrors.txt	(revision c87b6043f3954c3bc70ede6f6fc0593d735783ae)
@@ -0,0 +1,6 @@
+concurrent/keywordErrors.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+thread A with body
+
+concurrent/keywordErrors.cfa:6:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+thread B with body
+
Index: tests/concurrent/.expect/mainError.nast.txt
===================================================================
--- tests/concurrent/.expect/mainError.nast.txt	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
+++ 	(revision )
@@ -1,11 +1,0 @@
-concurrent/mainError.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-thread Test with body
-
-concurrent/mainError.cfa:2:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-main: function
-... with parameters
-  reference to instance of struct Test with body
-... returning nothing
- with body
-  Compound Statement:
-
Index: tests/concurrent/.expect/mainError.oast.txt
===================================================================
--- tests/concurrent/.expect/mainError.oast.txt	(revision 1bcbf025a64d88a84a86c7b5d07e08eaeefc8b36)
+++ 	(revision )
@@ -1,11 +1,0 @@
-concurrent/mainError.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-thread Test: with body 1
-
-concurrent/mainError.cfa:2:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-main: function
-... with parameters
-  reference to instance of struct Test with body 1
-... returning nothing
-... with body
-  CompoundStmt
-
Index: tests/concurrent/.expect/mainError.txt
===================================================================
--- tests/concurrent/.expect/mainError.txt	(revision c87b6043f3954c3bc70ede6f6fc0593d735783ae)
+++ tests/concurrent/.expect/mainError.txt	(revision c87b6043f3954c3bc70ede6f6fc0593d735783ae)
@@ -0,0 +1,11 @@
+concurrent/mainError.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+thread Test with body
+
+concurrent/mainError.cfa:2:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+main: function
+... with parameters
+  reference to instance of struct Test with body
+... returning nothing
+ with body
+  Compound Statement:
+