Removed references to Pew::singleton() in helper functions