These changes aren't backwards-compatible, and it adds un-necessary boilerplate to test helpers.

Could the Billy.proxy singleton be lazy-loaded instead?