Yep, fine by me. I'd love to pull that namespace apart, but I kept running into circular requires. :(