Index: src/SymTab/Autogen.h
===================================================================
--- src/SymTab/Autogen.h	(revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71)
+++ src/SymTab/Autogen.h	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:53:34 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:50:25 2017
-// Update Count     : 15
+// Last Modified On : Fri Dec 13 16:38:06 2019
+// Update Count     : 16
 //
 
@@ -34,4 +34,5 @@
 #include "SynTree/Expression.h"   // for NameExpr, ConstantExpr, UntypedExpr...
 #include "SynTree/Type.h"         // for Type, ArrayType, Type::Qualifiers
+#include "SynTree/Statement.h"    // for CompoundStmt, DeclStmt, ExprStmt
 
 class CompoundStmt;
Index: src/SymTab/Demangle.cc
===================================================================
--- src/SymTab/Demangle.cc	(revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71)
+++ src/SymTab/Demangle.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jul 19 12:52:41 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 30 13:46:33 2019
-// Update Count     : 3
+// Last Modified On : Fri Dec 13 14:54:15 2019
+// Update Count     : 4
 //
 
@@ -366,5 +366,5 @@
 				// type variable types
 				for (size_t k = 0; k < TypeDecl::NUMBER_OF_KINDS; ++k) {
-					static const std::string typeVariableNames[] = { "DT", "FT", "TT", };
+					static const std::string typeVariableNames[] = { "DT", "OT", "FT", "TT", };
 					static_assert(
 						sizeof(typeVariableNames)/sizeof(typeVariableNames[0]) == TypeDecl::NUMBER_OF_KINDS,
Index: src/SymTab/Indexer.cc
===================================================================
--- src/SymTab/Indexer.cc	(revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71)
+++ src/SymTab/Indexer.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Fri Mar  8 13:55:00 2019
-// Update Count     : 21
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 23:43:19 2019
+// Update Count     : 22
 //
 
@@ -31,6 +31,6 @@
 #include "InitTweak/InitTweak.h"   // for isConstructor, isCopyFunction, isC...
 #include "Mangler.h"               // for Mangler
-#include "Parser/LinkageSpec.h"    // for isMangled, isOverridable, Spec
 #include "ResolvExpr/typeops.h"    // for typesCompatible
+#include "SynTree/LinkageSpec.h"   // for isMangled, isOverridable, Spec
 #include "SynTree/Constant.h"      // for Constant
 #include "SynTree/Declaration.h"   // for DeclarationWithType, FunctionDecl
Index: src/SymTab/Mangler.cc
===================================================================
--- src/SymTab/Mangler.cc	(revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71)
+++ src/SymTab/Mangler.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 30 13:46:10 2019
-// Update Count     : 26
+// Last Modified On : Fri Dec 13 23:43:49 2019
+// Update Count     : 28
 //
 #include "Mangler.h"
@@ -26,6 +26,6 @@
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/utility.h"              // for toString
-#include "Parser/LinkageSpec.h"          // for Spec, isOverridable, AutoGen, Int...
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
+#include "SynTree/LinkageSpec.h"         // for Spec, isOverridable, AutoGen, Int...
 #include "SynTree/Declaration.h"         // for TypeDecl, DeclarationWithType
 #include "SynTree/Expression.h"          // for TypeExpr, Expression, operator<<
@@ -654,5 +654,5 @@
 			// aside from the assert false.
 			assertf(false, "Mangler_new should not visit typedecl: %s", toCString(decl));
-			assertf( decl->kind < ast::TypeVar::Kind::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind );
+			assertf( decl->kind < ast::TypeDecl::Kind::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind );
 			mangleName << Encoding::typeVariables[ decl->kind ] << ( decl->name.length() ) << decl->name;
 		}
@@ -674,11 +674,11 @@
 					for ( const ast::TypeDecl * decl : ptype->forall ) {
 						switch ( decl->kind ) {
-						case ast::TypeVar::Kind::Dtype:
+						case ast::TypeDecl::Kind::Dtype:
 							dcount++;
 							break;
-						case ast::TypeVar::Kind::Ftype:
+						case ast::TypeDecl::Kind::Ftype:
 							fcount++;
 							break;
-						case ast::TypeVar::Kind::Ttype:
+						case ast::TypeDecl::Kind::Ttype:
 							vcount++;
 							break;
Index: src/SymTab/ManglerCommon.cc
===================================================================
--- src/SymTab/ManglerCommon.cc	(revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71)
+++ src/SymTab/ManglerCommon.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:44:03 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 14 17:06:37 2019
-// Update Count     : 26
+// Last Modified On : Fri Dec 13 14:54:38 2019
+// Update Count     : 28
 //
 
@@ -104,4 +104,5 @@
 			const std::string typeVariables[] = {
 				"BD", // dtype
+				"BO", // otype
 				"BF", // ftype
 				"BT", // ttype
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 312029a731fd1bf1cdd24d3e1d75abf51eb09d71)
+++ src/SymTab/Validate.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 10 22:22:01 2019
-// Update Count     : 362
+// Last Modified On : Fri Dec 13 23:43:34 2019
+// Update Count     : 363
 //
 
@@ -69,9 +69,9 @@
 #include "InitTweak/GenInit.h"         // for fixReturnStatements
 #include "InitTweak/InitTweak.h"       // for isCtorDtorAssign
-#include "Parser/LinkageSpec.h"        // for C
 #include "ResolvExpr/typeops.h"        // for typesCompatible
 #include "ResolvExpr/Resolver.h"       // for findSingleExpression
 #include "ResolvExpr/ResolveTypeof.h"  // for resolveTypeof
 #include "SymTab/Autogen.h"            // for SizeType
+#include "SynTree/LinkageSpec.h"       // for C
 #include "SynTree/Attribute.h"         // for noAttributes, Attribute
 #include "SynTree/Constant.h"          // for Constant