Index: src/main.cc
===================================================================
--- src/main.cc	(revision 55cbff8c7b498a42777350d60acf37d362ddf0e1)
+++ src/main.cc	(revision da6396f08b20205f1e13e248f77613108fa5b7b1)
@@ -338,9 +338,4 @@
 		PASS( "Gen Init", InitTweak::genInit( translationUnit ) );
 
-		if ( libcfap ) {
-			// generate the bodies of cfa library functions
-			LibCfa::makeLibCfa( translationUnit );
-		} // if
-
 		CodeTools::fillLocations( translationUnit );
 
@@ -356,5 +351,8 @@
 			PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( transUnit ) );
 
-			// LibCfa::makeLibCfa
+			if ( libcfap ) {
+				// Generate the bodies of cfa library functions.
+				LibCfa::makeLibCfa( transUnit );
+			} // if
 
 			if ( declstatsp ) {
@@ -382,9 +380,13 @@
 
 			PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));
+
 			translationUnit = convert( move( transUnit ) );
 		} else {
 			PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
 
-			// LibCfa::makeLibCfa
+			if ( libcfap ) {
+				// Generate the bodies of cfa library functions.
+				LibCfa::makeLibCfa( translationUnit );
+			} // if
 
 			if ( declstatsp ) {