Refactor some billing code

A small cleanup that I started during the payday rewrite.