Index: src/GenPoly/InstantiateGenericNew.cpp
===================================================================
--- src/GenPoly/InstantiateGenericNew.cpp	(revision 1c0657a24705f031e11cf6079e70e920d69afcfa)
+++ src/GenPoly/InstantiateGenericNew.cpp	(revision 01865fb2bd5249a71fe41e9769e5bb5833723bc2)
@@ -417,8 +417,10 @@
 
 struct GenericInstantiator final :
+		public ast::WithCodeLocation,
+		public ast::WithConstTypeSubstitution,
+		public ast::WithDeclsToAdd<>,
 		public ast::WithGuards,
-		public ast::WithVisitorRef<GenericInstantiator>,
-		public ast::WithConstTypeSubstitution,
-		public ast::WithDeclsToAdd<> {
+		public ast::WithVisitorRef<GenericInstantiator>
+{
 	/// Map of (generic type, parameter list) pairs
 	/// to concrete type instantiations.
@@ -435,6 +437,4 @@
 	/// member from an instantiation.
 	int memberIndex = -1;
-	/// Keep track of the nearest location to fill in locations.
-	CodeLocation const * location = nullptr;
 
 	GenericInstantiator() :