Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision 436c0deab931c3644feb0da7d5a23034b5e7cfd3)
+++ src/InitTweak/FixInit.cc	(revision 0508ab37015e515ab083ce4225257d934e451d93)
@@ -56,5 +56,5 @@
 		typedef std::unordered_map< int, int > UnqCount;
 
-		class InsertImplicitCalls {
+		class InsertImplicitCalls : public WithTypeSubstitution {
 		public:
 			/// wrap function application expressions as ImplicitCopyCtorExpr nodes so that it is easy to identify which
@@ -69,5 +69,4 @@
 			// collects environments for relevant nodes
 			EnvMap & envMap;
-			TypeSubstitution * env; //Magically populated by the PassVisitor
 		};
 
@@ -192,5 +191,5 @@
 		};
 
-		class FixInit {
+		class FixInit : public WithStmtsToAdd {
 		  public:
 			/// expand each object declaration to use its constructor after it is declared.
@@ -200,5 +199,4 @@
 
 			std::list< Declaration * > staticDtorDecls;
-			std::list< Statement * > stmtsToAddAfter; // found by PassVisitor
 		};