Overhaul handling of default and out-of-bounds namespaces