Index: src/CompilationState.cpp
===================================================================
--- src/CompilationState.cpp	(revision a783c74ba6b959c19144a6c39d4fb911d22b5eb2)
+++ src/CompilationState.cpp	(revision 2c2e8658964604af2fdd357cb2d109c60b4e757f)
@@ -10,6 +10,6 @@
 // Created On       : Mon Ju1 30 10:47:01 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr 10 19:12:50 2023
-// Update Count     : 6
+// Last Modified On : Sat Mar  7 15:43:02 2026
+// Update Count     : 11
 //
 
@@ -18,13 +18,13 @@
 int
 	astp = false,
-	bresolvep = false,
+	bresolverp = false,
 	bboxp = false,
 	bcodegenp = false,
-	ctorinitp = false,
+	ctordtorp = false,
 	declstatsp = false,
-	exdeclp = false,
-	exprp = false,
+	excpdeclp = false,
 	expraltp = false,
-	genericsp = false,
+	expranlp = false,
+	instgenp = false,
 	invariant = false,
 	libcfap = false,
@@ -39,5 +39,5 @@
 	treep = false,
 	tuplep = false,
-	validp = false,
+	valideclp = false,
 	errorp = false,
 	codegenp = false,
Index: src/CompilationState.hpp
===================================================================
--- src/CompilationState.hpp	(revision a783c74ba6b959c19144a6c39d4fb911d22b5eb2)
+++ src/CompilationState.hpp	(revision 2c2e8658964604af2fdd357cb2d109c60b4e757f)
@@ -10,6 +10,6 @@
 // Created On       : Mon Ju1 30 10:47:01 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr 10 19:12:53 2023
-// Update Count     : 6
+// Last Modified On : Sat Mar  7 15:39:59 2026
+// Update Count     : 14
 //
 
@@ -17,13 +17,13 @@
 extern int
 	astp,
-	bresolvep,
+	bresolverp,
 	bboxp,
 	bcodegenp,
-	ctorinitp,
+	ctordtorp,
 	declstatsp,
-	exdeclp,
-	exprp,
+	excpdeclp,
 	expraltp,
-	genericsp,
+	expranlp,
+	instgenp,
 	invariant,
 	libcfap,
@@ -38,5 +38,5 @@
 	treep,
 	tuplep,
-	validp,
+	valideclp,
 	errorp,
 	codegenp,
Index: src/main.cpp
===================================================================
--- src/main.cpp	(revision a783c74ba6b959c19144a6c39d4fb911d22b5eb2)
+++ src/main.cpp	(revision 2c2e8658964604af2fdd357cb2d109c60b4e757f)
@@ -10,6 +10,6 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 23 16:38:09 2024
-// Update Count     : 691
+// Last Modified On : Fri Mar 20 08:10:38 2026
+// Update Count     : 710
 //
 
@@ -202,5 +202,5 @@
 
 		PASS( "Translate Exception Declarations", ControlStruct::translateExcept, transUnit );
-		DUMP( exdeclp, transUnit );
+		DUMP( excpdeclp, transUnit );
 		PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign, transUnit );
 		PASS( "Replace Typedefs", Validate::replaceTypedef, transUnit );
@@ -242,10 +242,10 @@
 		} // if
 
-		if ( expraltp ) {
+		if ( expranlp ) {
 			ResolvExpr::printCandidates( transUnit );
 			return EXIT_SUCCESS;
 		} // if
 
-		DUMP( validp, transUnit );
+		DUMP( valideclp, transUnit );
 
 		PASS( "Translate Throws", ControlStruct::translateThrows, transUnit );
@@ -265,5 +265,5 @@
 		} // if
 
-		DUMP( bresolvep, transUnit );
+		DUMP( bresolverp, transUnit );
 
 		if ( resolvprotop ) {
@@ -273,10 +273,10 @@
 
 		PASS( "Resolve", ResolvExpr::resolve, transUnit );
-		DUMP( exprp, transUnit );
-		PASS( "Fix Init", InitTweak::fix, transUnit, buildingLibrary() ); // Here
+		DUMP( expranlp, transUnit );
+		PASS( "Fix Init", InitTweak::fix, transUnit, buildingLibrary() );
 		PASS( "Erase With", ResolvExpr::eraseWith, transUnit );
 
 		// fix ObjectDecl - replaces ConstructorInit nodes
-		DUMP( ctorinitp, transUnit );
+		DUMP( ctordtorp, transUnit );
 
 		// Currently not working due to unresolved issues with UniqueExpr
@@ -297,5 +297,5 @@
 
 		PASS( "Instantiate Generics", GenPoly::instantiateGeneric, transUnit );
-		DUMP( genericsp, transUnit );
+		DUMP( instgenp, transUnit );
 
 		PASS( "Convert L-Value", GenPoly::convertLvalue, transUnit );
@@ -422,15 +422,16 @@
 	// AST dumps
 	{ "ast", astp, true, "print AST after parsing" },
-	{ "excpdecl", exdeclp, true, "print AST after translating exception decls" },
-	{ "symevt", symtabp, true, "print AST after symbol table events" },
-	{ "expralt", expraltp, true, "print AST after expressions alternatives" },
-	{ "valdecl", validp, true, "print AST after declaration validation pass" },
-	{ "bresolver", bresolvep, true, "print AST before resolver step" },
-	{ "expranly", exprp, true, "print AST after expression analysis" },
-	{ "ctordtor", ctorinitp, true, "print AST after ctor/dtor are replaced" },
+	{ "excpdecl", excpdeclp, true, "print AST after translating exception decls" },
+	// These flags are currently disconnected from whatever they did in the past.
+	// { "symevt", symtabp, true, "print AST after symbol table events" },
+	// { "expralt", expraltp, true, "print AST after expressions alternatives" },
+	{ "validecl", valideclp, true, "print AST after declaration validation pass" },
+	{ "bresolver", bresolverp, true, "print AST before resolver step" },
+	{ "expranl", expranlp, true, "print AST after expression analysis" },
+	{ "ctordtor", ctordtorp, true, "print AST after ctor/dtor are replaced" },
 	{ "tuple", tuplep, true, "print AST after tuple expansion" },
-	{ "instgen", genericsp, true, "print AST after instantiate generics" },
+	{ "instgen", instgenp, true, "print AST after instantiate generics" },
 	{ "bbox", bboxp, true, "print AST before box pass" },
-	{ "bcodegen", bcodegenp, true, "print AST before code generation" }
+	{ "bcodegen", bcodegenp, true, "print AST before code generation" },
 };
 enum { printoptsSize = sizeof( printopts ) / sizeof( printopts[0] ) };