First stab at redoing getBillingCycle() and friends.