Fixing singletons to private access.

We do this so we can control access to the singleton object. It's fairly
standard I think. We probably just overlooked this when we moved our
static members around.