Payday cleanup

Here's a small cleanup that's an independent part of my payday rewrite (which isn't finished yet).