Fix clang static analyzer warnings for singleton classes

I _hate_ singleton classes, but I guess they're appropriate here;
regardless, the static analyzer warnings were annoying, and this
fixes them. A bit of a hack, but I _know_ the singleton classes are
implemented properly.