Index: src/ResolvExpr/CandidateFinder.cpp
===================================================================
--- src/ResolvExpr/CandidateFinder.cpp	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/CandidateFinder.cpp	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -1590,5 +1590,5 @@
 
 	if ( mode.failFast && candidates.empty() ) {
-		switch(finder.pass.reason.code) {
+		switch(finder.core.reason.code) {
 		case Finder::NotFound:
 			{ SemanticError( expr, "No alternatives for expression " ); break; }
Index: src/ResolvExpr/CastCost.cc
===================================================================
--- src/ResolvExpr/CastCost.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/CastCost.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -242,5 +242,5 @@
 			dst, srcIsLvalue, symtab, env, localCastCost );
 		src->accept( converter );
-		return converter.pass.cost;
+		return converter.core.cost;
 	}
 }
Index: src/ResolvExpr/CommonType.cc
===================================================================
--- src/ResolvExpr/CommonType.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/CommonType.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -968,5 +968,5 @@
 		ast::Pass<CommonType_new> visitor{ type2, widen, symtab, env, open };
 		type1->accept( visitor );
-		ast::ptr< ast::Type > result = visitor.pass.result;
+		ast::ptr< ast::Type > result = visitor.core.result;
 
 		// handling for opaque type declarations (?)
Index: src/ResolvExpr/ConversionCost.cc
===================================================================
--- src/ResolvExpr/ConversionCost.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/ConversionCost.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -522,5 +522,5 @@
 		ast::Pass<ConversionCost_new> converter( dst, srcIsLvalue, symtab, env, localConversionCost );
 		src->accept( converter );
-		return converter.pass.cost;
+		return converter.core.cost;
 	}
 }
@@ -565,5 +565,5 @@
 			ast::Pass<ConversionCost_new> converter( dst, srcIsLvalue, symtab, env, localConversionCost );
 			src->accept( converter );
-			return converter.pass.cost;
+			return converter.core.cost;
 		}
 	} else {
Index: src/ResolvExpr/PolyCost.cc
===================================================================
--- src/ResolvExpr/PolyCost.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/PolyCost.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -87,5 +87,5 @@
 	ast::Pass<PolyCost_new> costing( symtab, env );
 	type->accept( costing );
-	return costing.pass.result;
+	return costing.core.result;
 }
 
Index: src/ResolvExpr/PtrsAssignable.cc
===================================================================
--- src/ResolvExpr/PtrsAssignable.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/PtrsAssignable.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -155,5 +155,5 @@
 		ast::Pass<PtrsAssignable_new> visitor( dst, env );
 		src->accept( visitor );
-		return visitor.pass.result;
+		return visitor.core.result;
 	}
 
Index: src/ResolvExpr/PtrsCastable.cc
===================================================================
--- src/ResolvExpr/PtrsCastable.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/PtrsCastable.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -293,5 +293,5 @@
 		ast::Pass< PtrsCastable_new > ptrs{ dst, env, symtab };
 		src->accept( ptrs );
-		return ptrs.pass.result;
+		return ptrs.core.result;
 	}
 }
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/Resolver.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -982,5 +982,5 @@
 		ast::Pass<DeleteFinder_new> finder;
 		expr->accept( finder );
-		return finder.pass.delExpr;
+		return finder.core.delExpr;
 	}
 
Index: src/ResolvExpr/SpecCost.cc
===================================================================
--- src/ResolvExpr/SpecCost.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/SpecCost.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -217,6 +217,6 @@
 	}
 	ast::Pass<SpecCounter> counter;
-	type->accept( *counter.pass.visitor );
-	return counter.pass.get_count();
+	type->accept( counter );
+	return counter.core.get_count();
 }
 
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
+++ src/ResolvExpr/Unify.cc	(revision 7ff3e5224d41942a97b813aec3db3d1126db4898)
@@ -1185,5 +1185,5 @@
 			ast::Pass<Unify_new> comparator{ type2, env, need, have, open, widen, symtab };
 			type1->accept( comparator );
-			return comparator.pass.result;
+			return comparator.core.result;
 		}
 	}