improved handling of disabled namespace

singletons are bad, mmkay