Index: src/GenPoly/Box.cpp
===================================================================
--- src/GenPoly/Box.cpp	(revision 00f89a68c67ed1f843b1f38ee09f2ca4b4faf670)
+++ src/GenPoly/Box.cpp	(revision 29075d1e4c22e096eb350d86267c83b273bb0de7)
@@ -55,5 +55,5 @@
 /// Adds layout-generation functions to polymorphic types.
 struct LayoutFunctionBuilder final :
-		public ast::WithDeclsToAdd<>,
+		public ast::WithDeclsToAdd,
 		public ast::WithShortCircuiting,
 		public ast::WithVisitorRef<LayoutFunctionBuilder> {
@@ -344,5 +344,5 @@
 		public ast::WithGuards,
 		public ast::WithShortCircuiting,
-		public ast::WithStmtsToAdd<>,
+		public ast::WithStmtsToAdd,
 		public ast::WithVisitorRef<CallAdapter> {
 	CallAdapter();
@@ -1575,7 +1575,7 @@
 struct PolyGenericCalculator final :
 		public ast::WithConstTypeSubstitution,
-		public ast::WithDeclsToAdd<>,
+		public ast::WithDeclsToAdd,
 		public ast::WithGuards,
-		public ast::WithStmtsToAdd<>,
+		public ast::WithStmtsToAdd,
 		public ast::WithVisitorRef<PolyGenericCalculator> {
 	PolyGenericCalculator();
Index: src/GenPoly/InstantiateGeneric.cpp
===================================================================
--- src/GenPoly/InstantiateGeneric.cpp	(revision 00f89a68c67ed1f843b1f38ee09f2ca4b4faf670)
+++ src/GenPoly/InstantiateGeneric.cpp	(revision 29075d1e4c22e096eb350d86267c83b273bb0de7)
@@ -277,5 +277,5 @@
 		public ast::WithVisitorRef<FixDtypeStatic>,
 		public ast::WithShortCircuiting,
-		public ast::WithStmtsToAdd<> {
+		public ast::WithStmtsToAdd {
 	ast::ApplicationExpr const * previsit( ast::ApplicationExpr const * expr );
 	void previsit( ast::AddressExpr const * expr );
@@ -421,5 +421,5 @@
 		public ast::WithCodeLocation,
 		public ast::WithConstTypeSubstitution,
-		public ast::WithDeclsToAdd<>,
+		public ast::WithDeclsToAdd,
 		public ast::WithGuards,
 		public ast::WithVisitorRef<GenericInstantiator>
Index: src/GenPoly/Lvalue.cpp
===================================================================
--- src/GenPoly/Lvalue.cpp	(revision 00f89a68c67ed1f843b1f38ee09f2ca4b4faf670)
+++ src/GenPoly/Lvalue.cpp	(revision 29075d1e4c22e096eb350d86267c83b273bb0de7)
@@ -85,5 +85,5 @@
 struct ReferenceConversions final :
 		public ast::WithConstTranslationUnit,
-		public ast::WithGuards, public ast::WithStmtsToAdd<> {
+		public ast::WithGuards, public ast::WithStmtsToAdd {
 	ast::Expr const * postvisit( ast::CastExpr const * expr );
 	ast::Expr const * postvisit( ast::AddressExpr const * expr );
Index: src/GenPoly/Specialize.cpp
===================================================================
--- src/GenPoly/Specialize.cpp	(revision 00f89a68c67ed1f843b1f38ee09f2ca4b4faf670)
+++ src/GenPoly/Specialize.cpp	(revision 29075d1e4c22e096eb350d86267c83b273bb0de7)
@@ -30,5 +30,5 @@
 struct SpecializeCore final :
 		public ast::WithConstTypeSubstitution,
-		public ast::WithDeclsToAdd<>,
+		public ast::WithDeclsToAdd,
 		public ast::WithVisitorRef<SpecializeCore> {
 	std::string paramPrefix = "_p";