Index: src/InitTweak/InitTweak.cc
===================================================================
--- src/InitTweak/InitTweak.cc	(revision 60a80627d0a7fda17787b753d33a741d3719f79a)
+++ src/InitTweak/InitTweak.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -127,5 +127,5 @@
 	ast::Pass< InitFlattener_new > flattener;
 	maybe_accept( init, flattener );
-	return std::move( flattener.pass.argList );
+	return std::move( flattener.core.argList );
 }
 
@@ -561,5 +561,5 @@
 		ast::Pass< CallFinder_new > finder{ std::vector< std::string >{ "?{}", "^?{}" } };
 		maybe_accept( stmt, finder );
-		return std::move( finder.pass.matches );
+		return std::move( finder.core.matches );
 	}