Get rid of not-quite-singleton before someone uses it

This could cause issues around an in-process reboot like Spigot has. Better to avoid singletons where we have this.