Fair point, withXmlActions came out of testability. It looks like we're crossing a boundary where we do need to know more about the context we're running in. I've seen the problem for a little bit that a context helper might want to look at the existing. In the meantime, I'd say just rename the variable and we'll deal with passing in Job later.