I think we should adjust all of this code to build up the Map of context overrides and then call withOverriddenContext() once at the end.  That'll be a lot cleaner.