Made the singleton stuff sane