This new class has a mix of global functions and private methods on a singleton, and that makes it hard to use it in tests.  We should streamline the API so a test instance can be injected when testing.