Better implementation for forming the singleton wrapper.