Payday rewrite, part 5

Step 6 of #2508. Follow-on from #2541.
> In tests.

I assume that's an unintended consequence of the test infrastructure, yes?