Just wondering if we should make this a top level package-protected class? I would have to search, but I seem to recall other instances of this. Not sure just yet.