Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision 7b6ca2e67dfc28fe0673afb07a368d389f5318d5)
+++ src/InitTweak/GenInit.cc	(revision 4eb31f2b13d7cf03cdf3f67290325b3cf371535b)
@@ -44,5 +44,5 @@
 	}
 
-	class ReturnFixer {
+	class ReturnFixer : public WithStmtsToAdd, public WithScopes {
 	  public:
 		/// consistently allocates a temporary variable for the return value
@@ -53,7 +53,4 @@
 		void premutate( FunctionDecl *functionDecl );
 		void premutate( ReturnStmt * returnStmt );
-
-		at_cleanup_t at_cleanup;
-		std::list< Statement * > stmtsToAddBefore;
 
 	  protected:
@@ -160,6 +157,6 @@
 
 	void ReturnFixer::premutate( FunctionDecl *functionDecl ) {
-		GuardValue( this, ftype );
-		GuardValue( this, funcName );
+		GuardValue( ftype );
+		GuardValue( funcName );
 
 		ftype = functionDecl->get_functionType();