Index: src/Tests/Expect-e/AsmName.txt
===================================================================
--- src/Tests/Expect-e/AsmName.txt	(revision b1d6dd544a60d22c07bdaaac6bc78180bf2015ad)
+++ src/Tests/Expect-e/AsmName.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -1,3 +1,3 @@
-x: auto signed int 
+x: extern signed int 
 fred: function
     with parameters
Index: src/Tests/Expect-e/Attributes.txt
===================================================================
--- src/Tests/Expect-e/Attributes.txt	(revision b1d6dd544a60d22c07bdaaac6bc78180bf2015ad)
+++ src/Tests/Expect-e/Attributes.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -1,1 +1,1 @@
-Error at line 8 reading token "*"
+Error at line 58 reading token "*"
Index: src/Tests/Expect-e/Context.txt
===================================================================
--- src/Tests/Expect-e/Context.txt	(revision b1d6dd544a60d22c07bdaaac6bc78180bf2015ad)
+++ src/Tests/Expect-e/Context.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -54,5 +54,5 @@
 
 
-        Declaration of x: auto type
+        Declaration of x: extern type
         Declaration of ?=?: automatically generated function
             with parameters
@@ -62,5 +62,5 @@
               instance of type x (not function type) 
 
-        Declaration of y: auto type
+        Declaration of y: extern type
           with assertions
             instance of context has_r 
Index: src/Tests/Expect-e/Function.txt
===================================================================
--- src/Tests/Expect-e/Function.txt	(revision b1d6dd544a60d22c07bdaaac6bc78180bf2015ad)
+++ src/Tests/Expect-e/Function.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -245,4 +245,4 @@
 
 
-cfa-cpp: GenPoly/Box.cc:398: void GenPoly::{anonymous}::Pass1::boxParams(ApplicationExpr*, FunctionType*, std::list<Expression*>::iterator&, const TyVarMap&): Assertion `arg != appExpr->get_args().end()' failed.
+cfa-cpp: GenPoly/Box.cc:401: void GenPoly::{anonymous}::Pass1::boxParams(ApplicationExpr*, FunctionType*, std::list<Expression*>::iterator&, const TyVarMap&): Assertion `arg != appExpr->get_args().end()' failed.
 Aborted (core dumped)
Index: src/Tests/Expect-e/TypeGenerator.txt
===================================================================
--- src/Tests/Expect-e/TypeGenerator.txt	(revision b1d6dd544a60d22c07bdaaac6bc78180bf2015ad)
+++ src/Tests/Expect-e/TypeGenerator.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -53,9 +53,9 @@
             Name: *?
         ...to: 
-            Variable Expression: _dst: pointer to instance of struct S1 
+            Variable Expression: _dst: pointer to instance of struct S2 
     Member Expression, with field: 
       i: instance of type T (not function type) 
     from aggregate: 
-      Variable Expression: _src: instance of struct S1 
+      Variable Expression: _src: instance of struct S2 
 
 Error: No reasonable alternatives for expression Applying untyped: 
@@ -69,9 +69,9 @@
             Name: *?
         ...to: 
-            Variable Expression: _dst: pointer to instance of struct S2 
+            Variable Expression: _dst: pointer to instance of struct S24 
     Member Expression, with field: 
       i: instance of type T (not function type) 
     from aggregate: 
-      Variable Expression: _src: instance of struct S2 
+      Variable Expression: _src: instance of struct S24 
 
 Error: No reasonable alternatives for expression Applying untyped: 
Index: src/Tests/Expect-e/report
===================================================================
--- src/Tests/Expect-e/report	(revision b1d6dd544a60d22c07bdaaac6bc78180bf2015ad)
+++ src/Tests/Expect-e/report	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -2,4 +2,8 @@
 ---Array.txt---
 ---AsmName.txt---
+1c1
+< x: auto signed int 
+---
+> x: extern signed int 
 ---Attributes.txt---
 ---Cast.txt---
@@ -9,4 +13,12 @@
 ---Constant0-1.txt---
 ---Context.txt---
+56c56
+<         Declaration of x: auto type
+---
+>         Declaration of x: extern type
+64c64
+<         Declaration of y: auto type
+---
+>         Declaration of y: extern type
 ---DeclarationErrors.txt---
 ---DeclarationSpecifier.txt---
@@ -16,4 +28,8 @@
 ---Forall.txt---
 ---Function.txt---
+247c247
+< cfa-cpp: GenPoly/Box.cc:398: void GenPoly::{anonymous}::Pass1::boxParams(ApplicationExpr*, FunctionType*, std::list<Expression*>::iterator&, const TyVarMap&): Assertion `arg != appExpr->get_args().end()' failed.
+---
+> cfa-cpp: GenPoly/Box.cc:401: void GenPoly::{anonymous}::Pass1::boxParams(ApplicationExpr*, FunctionType*, std::list<Expression*>::iterator&, const TyVarMap&): Assertion `arg != appExpr->get_args().end()' failed.
 ---Functions.txt---
 ---GccExtensions.txt---