Index: src/Tests/Expect-v/AsmName.txt
===================================================================
--- src/Tests/Expect-v/AsmName.txt	(revision 883b46c18dfa29091d8ebb464473bc685d37dcb7)
+++ src/Tests/Expect-v/AsmName.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -1,3 +1,3 @@
-x: auto signed int 
+x: extern signed int 
 fred: function
     with parameters
Index: src/Tests/Expect-v/Attributes.txt
===================================================================
--- src/Tests/Expect-v/Attributes.txt	(revision 883b46c18dfa29091d8ebb464473bc685d37dcb7)
+++ src/Tests/Expect-v/Attributes.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -1,1 +1,1 @@
-Error at line 8 reading token "*"
+Error at line 58 reading token "*"
Index: src/Tests/Expect-v/Context.txt
===================================================================
--- src/Tests/Expect-v/Context.txt	(revision 883b46c18dfa29091d8ebb464473bc685d37dcb7)
+++ src/Tests/Expect-v/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-v/Functions.txt
===================================================================
--- src/Tests/Expect-v/Functions.txt	(revision 883b46c18dfa29091d8ebb464473bc685d37dcb7)
+++ src/Tests/Expect-v/Functions.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -165,13 +165,13 @@
       CompoundStmt
 
-fII3: auto function
-    with parameters
-      i: signed int 
-    returning 
-      signed int 
-    with body 
-      CompoundStmt
-
-fII4: auto function
+fII3: extern function
+    with parameters
+      i: signed int 
+    returning 
+      signed int 
+    with body 
+      CompoundStmt
+
+fII4: extern function
     with parameters
       i: signed int 
@@ -249,5 +249,5 @@
       CompoundStmt
 
-fO4: auto function
+fO4: extern function
       accepting unspecified arguments
     returning 
@@ -260,5 +260,5 @@
       CompoundStmt
 
-fO5: auto function
+fO5: extern function
       accepting unspecified arguments
     returning 
Index: src/Tests/Expect-v/TypeGenerator.txt
===================================================================
--- src/Tests/Expect-v/TypeGenerator.txt	(revision 883b46c18dfa29091d8ebb464473bc685d37dcb7)
+++ src/Tests/Expect-v/TypeGenerator.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -140,52 +140,4 @@
       signed int 
 
-struct S1
-    with parameters
-      T: type
-
-struct S1
-    with parameters
-      T: type
-
-    with members
-      i: instance of type T (not function type) 
-
-?=?: automatically generated inline static function
-    with parameters
-      _dst: pointer to instance of struct S1 
-      _src: instance of struct S1 
-    returning 
-      instance of struct S1 
-    with body 
-      CompoundStmt
-                  Expression Statement:
-            Applying untyped: 
-                Name: ?=?
-            ...to: 
-                Address of:
-                  Member Expression, with field: 
-                    i: instance of type T (not function type) 
-                  from aggregate: 
-                    Applying untyped: 
-                        Name: *?
-                    ...to: 
-                        Variable Expression: _dst: pointer to instance of struct S1 
-                Member Expression, with field: 
-                  i: instance of type T (not function type) 
-                from aggregate: 
-                  Variable Expression: _src: instance of struct S1 
-
-                  Return Statement, returning: Variable Expression: _src: instance of struct S1 
-
-
-
-v1: instance of struct S1 
-  with parameters
-    signed int 
-
-p: pointer to instance of struct S1 
-  with parameters
-    signed int 
-
 struct S2
     with parameters
@@ -224,5 +176,49 @@
 
 
-v2: instance of struct S2 
+v1: instance of struct S3 
+  with parameters
+    signed int 
+
+p: pointer to instance of struct S3 
+  with parameters
+    signed int 
+
+struct S24
+    with parameters
+      T: type
+
+    with members
+      i: instance of type T (not function type) 
+
+?=?: automatically generated inline static function
+    with parameters
+      _dst: pointer to instance of struct S24 
+      _src: instance of struct S24 
+    returning 
+      instance of struct S24 
+    with body 
+      CompoundStmt
+                  Expression Statement:
+            Applying untyped: 
+                Name: ?=?
+            ...to: 
+                Address of:
+                  Member Expression, with field: 
+                    i: instance of type T (not function type) 
+                  from aggregate: 
+                    Applying untyped: 
+                        Name: *?
+                    ...to: 
+                        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 S24 
+
+                  Return Statement, returning: Variable Expression: _src: instance of struct S24 
+
+
+
+v2: instance of struct S24 
   with parameters
     signed int