Tweak Singleton lifetime syntax