Index: src/Tests/Expect-s/Attributes.txt
===================================================================
--- src/Tests/Expect-s/Attributes.txt	(revision b1d6dd544a60d22c07bdaaac6bc78180bf2015ad)
+++ src/Tests/Expect-s/Attributes.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -1,1 +1,1 @@
-Error at line 8 reading token "*"
+Error at line 58 reading token "*"
Index: src/Tests/Expect-s/TypeGenerator.txt
===================================================================
--- src/Tests/Expect-s/TypeGenerator.txt	(revision b1d6dd544a60d22c07bdaaac6bc78180bf2015ad)
+++ src/Tests/Expect-s/TypeGenerator.txt	(revision 68cd1ce1134527e1c664cfdf84df37a7025de8a7)
@@ -4,4 +4,7 @@
 Adding type T
 Adding function ?+?
+--- Entering scope
+--- Leaving scope containing
+Adding function ?=?
 --- Entering scope
 --- Leaving scope containing
@@ -33,27 +36,4 @@
 Adding object p
 --- Leaving scope containing
-Adding fwd decl for struct S1
---- Entering scope
---- Entering scope
---- Leaving scope containing
-Adding type T
---- Leaving scope containing
-T
-Adding struct S1
-Adding fwd decl for struct S1
---- Entering scope
---- Entering scope
---- Leaving scope containing
-Adding type T
-Adding object i
---- Leaving scope containing
-T
-Adding struct S1
---- Entering scope
---- Leaving scope containing
-Adding object v1
---- Entering scope
---- Leaving scope containing
-Adding object p
 Adding fwd decl for struct S2
 --- Entering scope
@@ -65,4 +45,20 @@
 T
 Adding struct S2
+Adding struct S3 from implicit forward declaration
+--- Entering scope
+--- Leaving scope containing
+Adding object v1
+--- Entering scope
+--- Leaving scope containing
+Adding object p
+Adding fwd decl for struct S24
+--- Entering scope
+--- Entering scope
+--- Leaving scope containing
+Adding type T
+Adding object i
+--- Leaving scope containing
+T
+Adding struct S24
 --- Entering scope
 --- Leaving scope containing