Switch some bindings to singletons