[jeremiep]

I've never seen a singleton I couldn't refactor away. Removing singletons always makes dependencies between modules more explicit which is a good thing.