Index: src/GenPoly/BoxNew.cpp
===================================================================
--- src/GenPoly/BoxNew.cpp	(revision 097c8d0db2c39c0fca0eb36f369aea4b09227342)
+++ src/GenPoly/BoxNew.cpp	(revision d3652dff49964cd0e31a788e5a2cfb4c84d10393)
@@ -1726,16 +1726,4 @@
 
 // --------------------------------------------------------------------------
-// TODO: This is kind of a blind test. I believe all withExprs are handled
-// in the resolver and we could clear them out after that.
-struct RemoveWithExprs final {
-	ast::FunctionDecl const * postvisit( ast::FunctionDecl const * decl ) {
-		if ( decl->withExprs.empty() ) return decl;
-		auto mutDecl = mutate( decl );
-		mutDecl->withExprs.clear();
-		return mutDecl;
-	}
-};
-
-// --------------------------------------------------------------------------
 /// Inserts code to access polymorphic layout inforation.
 /// * Replaces member and size/alignment/offsetof expressions on polymorphic
@@ -2511,5 +2499,4 @@
 	ast::Pass<DeclAdapter>::run( translationUnit );
 	ast::Pass<RewireAdapters>::run( translationUnit );
-	ast::Pass<RemoveWithExprs>::run( translationUnit );
 	ast::Pass<PolyGenericCalculator>::run( translationUnit );
 	ast::Pass<Eraser>::run( translationUnit );