I'd vote for keeping the simpler signature, and writing something separate to handle the one exceptional case that we have in the shutdown test, rather than changing all of these signatures just because of that one test.  Would that be doable?