Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision 6840e7c444f894b4717b6e1799f5624666ca025c)
+++ src/InitTweak/FixInit.cc	(revision 837ce062b91aebabe0e4639040b72bb6e66c8881)
@@ -653,9 +653,9 @@
 			// wraps the more complicated code.
 			static UniqueName dtorNamer( "__cleanup_dtor" );
-			FunctionDecl * dtorFunc = FunctionDecl::newFunction( dtorNamer.newName(), SymTab::genDefaultType( objDecl->type ), new CompoundStmt( noLabels ) );
+			FunctionDecl * dtorFunc = FunctionDecl::newFunction( dtorNamer.newName(), SymTab::genDefaultType( objDecl->type, false ), new CompoundStmt( noLabels ) );
 			stmtsToAddBefore.push_back( new DeclStmt( noLabels, dtorFunc ) );
 
 			// the original code contains uses of objDecl - replace them with the newly generated 'this' parameter.
-			ObjectDecl * thisParam = getThisParam( dtorFunc->type );
+			ObjectDecl * thisParam = getParamThis( dtorFunc->type );
 			VarExprReplacer::replace( dtor, { std::make_pair( objDecl, thisParam ) } );
 			dtorFunc->statements->push_back( dtor );