Index: src/main.cc
===================================================================
--- src/main.cc	(revision 00da199562ec3c4b8d4fbd5ae8a205c18cb892ce)
+++ src/main.cc	(revision fa6233afbad401cef32a415f97d649459035b5ce)
@@ -10,6 +10,6 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Henry Xue
-// Last Modified On : Tue Jul 20 04:27:35 2021
-// Update Count     : 658
+// Last Modified On : Mon Aug 23 15:42:08 2021
+// Update Count     : 650
 //
 
@@ -335,5 +335,5 @@
 		PASS( "Fix Names", CodeGen::fixNames( translationUnit ) );
 		PASS( "Gen Init", InitTweak::genInit( translationUnit ) );
-		PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
+
 		if ( libcfap ) {
 			// generate the bodies of cfa library functions
@@ -365,4 +365,7 @@
 			}
 			auto transUnit = convert( move( translationUnit ) );
+
+			PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( transUnit ) );
+			
 			PASS( "Resolve", ResolvExpr::resolve( transUnit ) );
 			if ( exprp ) {
@@ -376,4 +379,6 @@
 			translationUnit = convert( move( transUnit ) );
 		} else {
+			PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
+
 			PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
 			if ( exprp ) {