Index: src/SymTab/Mangler.cc
===================================================================
--- src/SymTab/Mangler.cc	(revision 361bf012e550db91b38f772bfbc7cb7ed2e49033)
+++ src/SymTab/Mangler.cc	(revision 3e5dd91354f39b161547cc1119ecef5890aa765f)
@@ -671,5 +671,5 @@
 					int dcount = 0, fcount = 0, vcount = 0, acount = 0;
 					mangleName += Encoding::forall;
-					for ( const ast::TypeDecl * decl : ptype->forall ) {
+					for ( auto & decl : ptype->forall ) {
 						switch ( decl->kind ) {
 						case ast::TypeDecl::Kind::Dtype:
@@ -686,11 +686,11 @@
 						} // switch
 						varNums[ decl->name ] = std::make_pair( nextVarNum, (int)decl->kind );
-						for ( const ast::DeclWithType * assert : decl->assertions ) {
-							ast::Pass<Mangler_new> sub_mangler(
-								mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums );
-							assert->accept( sub_mangler );
-							assertionNames.push_back( sub_mangler.core.get_mangleName() );
-							acount++;
-						} // for
+					} // for
+					for ( auto & assert : ptype->assertions ) {
+						ast::Pass<Mangler_new> sub_mangler(
+							mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums );
+						assert->var->accept( sub_mangler );
+						assertionNames.push_back( sub_mangler.core.get_mangleName() );
+						acount++;
 					} // for
 					mangleName += std::to_string( dcount ) + "_" + std::to_string( fcount ) + "_" + std::to_string( vcount ) + "_" + std::to_string( acount ) + "_";
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 361bf012e550db91b38f772bfbc7cb7ed2e49033)
+++ src/SymTab/Validate.cc	(revision 3e5dd91354f39b161547cc1119ecef5890aa765f)
@@ -1463,4 +1463,6 @@
 	}
 
+	/*
+
 	/// Associates forward declarations of aggregates with their definitions
 	class LinkReferenceToTypes_new final
@@ -1844,6 +1846,8 @@
 		}
 	};
+	*/
 } // anonymous namespace
 
+/*
 const ast::Type * validateType(
 		const CodeLocation & loc, const ast::Type * type, const ast::SymbolTable & symtab ) {
@@ -1854,4 +1858,5 @@
 	return type->accept( lrt )->accept( fpd );
 }
+*/
 
 } // namespace SymTab