Namespace fixup routines and their usage.