Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision 400b8bec42ab40f3a00bc24c1485bc941ead2174)
+++ src/InitTweak/GenInit.cc	(revision f6e6a55d53cd8b3b09c6daaeee01773aff551e6f)
@@ -402,8 +402,8 @@
 					retVal->location, "?{}", retVal, stmt->expr );
 				assertf( ctorStmt,
-					"ReturnFixer: genCtorDtor returned nllptr: %s / %s",
+					"ReturnFixer: genCtorDtor returned nullptr: %s / %s",
 					toString( retVal ).c_str(),
 					toString( stmt->expr ).c_str() );
-					stmtsToAddBefore.push_back( ctorStmt );
+				stmtsToAddBefore.push_back( ctorStmt );
 
 				// Return the retVal object.
@@ -421,4 +421,8 @@
 	void genInit( ast::TranslationUnit & transUnit ) {
 		ast::Pass<HoistArrayDimension_NoResolve_New>::run( transUnit );
+		ast::Pass<ReturnFixer_New>::run( transUnit );
+	}
+
+	void fixReturnStatements( ast::TranslationUnit & transUnit ) {
 		ast::Pass<ReturnFixer_New>::run( transUnit );
 	}
Index: src/InitTweak/GenInit.h
===================================================================
--- src/InitTweak/GenInit.h	(revision 400b8bec42ab40f3a00bc24c1485bc941ead2174)
+++ src/InitTweak/GenInit.h	(revision f6e6a55d53cd8b3b09c6daaeee01773aff551e6f)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 22 16:08:00 2021
-// Update Count     : 6
+// Last Modified On : Fri Mar 18 14:22:00 2022
+// Update Count     : 7
 //
 
@@ -31,4 +31,5 @@
 	/// Converts return statements into copy constructor calls on the hidden return variable
 	void fixReturnStatements( std::list< Declaration * > & translationUnit );
+	void fixReturnStatements( ast::TranslationUnit & translationUnit );
 
 	/// generates a single ctor/dtor statement using objDecl as the 'this' parameter and arg as the optional argument