Index: src/Validate/Autogen.cpp
===================================================================
--- src/Validate/Autogen.cpp	(revision 90be0cf4038a0d324a55f8ab409c9aa1b4ba02e2)
+++ src/Validate/Autogen.cpp	(revision ecf38123a0e4f99e0d73b57ef72d89c766288f78)
@@ -50,5 +50,5 @@
 // --------------------------------------------------------------------------
 struct AutogenerateRoutines final :
-		public ast::WithDeclsToAdd<>,
+		public ast::WithDeclsToAdd,
 		public ast::WithShortCircuiting {
 	void previsit( const ast::EnumDecl * enumDecl );
Index: src/Validate/CompoundLiteral.cpp
===================================================================
--- src/Validate/CompoundLiteral.cpp	(revision 90be0cf4038a0d324a55f8ab409c9aa1b4ba02e2)
+++ src/Validate/CompoundLiteral.cpp	(revision ecf38123a0e4f99e0d73b57ef72d89c766288f78)
@@ -27,5 +27,5 @@
 
 struct CompoundLiteral final :
-		public ast::WithDeclsToAdd<> {
+		public ast::WithDeclsToAdd {
 	ast::Storage::Classes storageClasses;
 
Index: src/Validate/HoistStruct.cpp
===================================================================
--- src/Validate/HoistStruct.cpp	(revision 90be0cf4038a0d324a55f8ab409c9aa1b4ba02e2)
+++ src/Validate/HoistStruct.cpp	(revision ecf38123a0e4f99e0d73b57ef72d89c766288f78)
@@ -68,5 +68,5 @@
  */
 struct HoistStructCore final :
-		public ast::WithDeclsToAdd<>, public ast::WithGuards {
+		public ast::WithDeclsToAdd, public ast::WithGuards {
 	ast::StructDecl const * previsit( ast::StructDecl const * decl );
 	ast::StructDecl const * postvisit( ast::StructDecl const * decl );
Index: src/Validate/HoistTypeDecls.cpp
===================================================================
--- src/Validate/HoistTypeDecls.cpp	(revision 90be0cf4038a0d324a55f8ab409c9aa1b4ba02e2)
+++ src/Validate/HoistTypeDecls.cpp	(revision ecf38123a0e4f99e0d73b57ef72d89c766288f78)
@@ -22,5 +22,5 @@
 namespace {
 
-struct HoistTypeDecls final : public ast::WithDeclsToAdd<> {
+struct HoistTypeDecls final : public ast::WithDeclsToAdd {
 	void previsit( ast::SizeofExpr const * );
 	void previsit( ast::AlignofExpr const * );
Index: src/Validate/ImplementEnumFunc.cpp
===================================================================
--- src/Validate/ImplementEnumFunc.cpp	(revision 90be0cf4038a0d324a55f8ab409c9aa1b4ba02e2)
+++ src/Validate/ImplementEnumFunc.cpp	(revision ecf38123a0e4f99e0d73b57ef72d89c766288f78)
@@ -472,5 +472,5 @@
 
 struct ImplementEnumFunc final :
-		public ast::WithDeclsToAdd<>, public ast::WithShortCircuiting {
+		public ast::WithDeclsToAdd, public ast::WithShortCircuiting {
 	void previsit(const ast::EnumDecl* enumDecl);
 	void previsit(const ast::FunctionDecl* functionDecl);
Index: src/Validate/LinkInstanceTypes.cpp
===================================================================
--- src/Validate/LinkInstanceTypes.cpp	(revision 90be0cf4038a0d324a55f8ab409c9aa1b4ba02e2)
+++ src/Validate/LinkInstanceTypes.cpp	(revision ecf38123a0e4f99e0d73b57ef72d89c766288f78)
@@ -27,5 +27,5 @@
 struct LinkTypesCore : public WithNoIdSymbolTable,
 		public ast::WithCodeLocation,
-		public ast::WithDeclsToAdd<>,
+		public ast::WithDeclsToAdd,
 		public ast::WithGuards,
 		public ast::WithShortCircuiting,
Index: src/Validate/ReplaceTypedef.cpp
===================================================================
--- src/Validate/ReplaceTypedef.cpp	(revision 90be0cf4038a0d324a55f8ab409c9aa1b4ba02e2)
+++ src/Validate/ReplaceTypedef.cpp	(revision ecf38123a0e4f99e0d73b57ef72d89c766288f78)
@@ -28,5 +28,5 @@
 struct ReplaceTypedefCore final :
 		public ast::WithCodeLocation,
-		public ast::WithDeclsToAdd<>,
+		public ast::WithDeclsToAdd,
 		public ast::WithGuards,
 		public ast::WithShortCircuiting,