Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision 9e23b446e321a87bbf5f2439c8d555a808d5e53c)
+++ src/InitTweak/GenInit.cc	(revision ffec1bfd5e6f76604c43a28508c5ddcc64bd3218)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenInit.cc --
+// GenInit.cc -- Generate initializers, and other stuff.
 //
 // Author           : Rob Schluntz
@@ -642,22 +642,22 @@
 
 ast::ConstructorInit * genCtorInit( const CodeLocation & loc, const ast::ObjectDecl * objDecl ) {
-	// call into genImplicitCall from Autogen.h to generate calls to ctor/dtor for each 
+	// call into genImplicitCall from Autogen.h to generate calls to ctor/dtor for each
 	// constructable object
 	InitExpander_new srcParam{ objDecl->init }, nullParam{ (const ast::Init *)nullptr };
 	ast::ptr< ast::Expr > dstParam = new ast::VariableExpr(loc, objDecl);
-	
-	ast::ptr< ast::Stmt > ctor = SymTab::genImplicitCall( 
+
+	ast::ptr< ast::Stmt > ctor = SymTab::genImplicitCall(
 		srcParam, dstParam, loc, "?{}", objDecl );
-	ast::ptr< ast::Stmt > dtor = SymTab::genImplicitCall( 
-		nullParam, dstParam, loc, "^?{}", objDecl, 
+	ast::ptr< ast::Stmt > dtor = SymTab::genImplicitCall(
+		nullParam, dstParam, loc, "^?{}", objDecl,
 		SymTab::LoopBackward );
-	
+
 	// check that either both ctor and dtor are present, or neither
 	assert( (bool)ctor == (bool)dtor );
 
 	if ( ctor ) {
-		// need to remember init expression, in case no ctors exist. If ctor does exist, want to 
+		// need to remember init expression, in case no ctors exist. If ctor does exist, want to
 		// use ctor expression instead of init.
-		ctor.strict_as< ast::ImplicitCtorDtorStmt >(); 
+		ctor.strict_as< ast::ImplicitCtorDtorStmt >();
 		dtor.strict_as< ast::ImplicitCtorDtorStmt >();
 
Index: src/InitTweak/GenInit.h
===================================================================
--- src/InitTweak/GenInit.h	(revision 9e23b446e321a87bbf5f2439c8d555a808d5e53c)
+++ src/InitTweak/GenInit.h	(revision ffec1bfd5e6f76604c43a28508c5ddcc64bd3218)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenInit.h --
+// GenInit.h -- Generate initializers, and other stuff.
 //
 // Author           : Rodolfo G. Esteves
@@ -29,5 +29,6 @@
 	void genInit( ast::TranslationUnit & translationUnit );
 
-	/// Converts return statements into copy constructor calls on the hidden return variable
+	/// Converts return statements into copy constructor calls on the hidden return variable.
+	/// This pass must happen before auto-gen.
 	void fixReturnStatements( std::list< Declaration * > & translationUnit );
 	void fixReturnStatements( ast::TranslationUnit & translationUnit );