Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision 4ec9513d69051bd7c1fc15bed54720534c629acf)
+++ src/InitTweak/GenInit.cc	(revision 86c12d650bf9d4424e92080ffe2210275a07b04e)
@@ -368,5 +368,5 @@
 
 	struct ReturnFixer_New final :
-			public ast::WithStmtsToAdd<>, ast::WithGuards {
+			public ast::WithStmtsToAdd<>, ast::WithGuards, ast::WithShortCircuiting {
 		void previsit( const ast::FunctionDecl * decl );
 		const ast::ReturnStmt * previsit( const ast::ReturnStmt * stmt );
@@ -376,4 +376,5 @@
 
 	void ReturnFixer_New::previsit( const ast::FunctionDecl * decl ) {
+		if (decl->linkage == ast::Linkage::Intrinsic) visit_children = false;
 		GuardValue( funcDecl ) = decl;
 	}