Cool, I'll swizzle this around so that we're not setting a singleton in the ctor. I not terribly worried about it however, as I think some of this code will go away when we just have one entry-point.