Removed this anonymous inner class, and instead made it top level
I don't expect others to construct this class manually, but this made it easier to unit test this class and make sure we get 100% coverage on it.