Index: src/Tuples/TupleExpansionNew.cpp
===================================================================
--- src/Tuples/TupleExpansionNew.cpp	(revision c36814a10414e8846cf2d03be08ada58aafc93a7)
+++ src/Tuples/TupleExpansionNew.cpp	(revision 0bd46fdf0880513efbef382cb2e926954f5c6001)
@@ -10,6 +10,6 @@
 // Created On       : Mon Aug 23 15:36:09 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 15 17:00:00 2022
-// Update Count     : 3
+// Last Modified On : Tue Sep 20 16:17:00 2022
+// Update Count     : 4
 //
 
@@ -102,7 +102,8 @@
 /// Replaces Tuple Assign & Index Expressions, and Tuple Types.
 struct TupleMainExpander final :
+		public ast::WithCodeLocation,
+		public ast::WithDeclsToAdd<>,
 		public ast::WithGuards,
-		public ast::WithVisitorRef<TupleMainExpander>,
-		public ast::WithDeclsToAdd<> {
+		public ast::WithVisitorRef<TupleMainExpander> {
 	ast::Expr const * postvisit( ast::TupleAssignExpr const * expr ) {
 		// Just move the env on the new top level expression.
@@ -111,10 +112,5 @@
 	}
 
-	void previsit( ast::ParseNode const * node ) {
-		GuardValue( location ) = &node->location;
-	}
-
-	void previsit( ast::CompoundStmt const * stmt ) {
-		previsit( (ast::ParseNode const *)stmt );
+	void previsit( ast::CompoundStmt const * ) {
 		GuardScope( typeMap );
 	}
@@ -217,5 +213,4 @@
 private:
 	ScopedMap< int, ast::StructDecl const * > typeMap;
-	CodeLocation const * location = nullptr;
 };