Yes, these are hacks around the case of a code without an explicit namespace. It's a case we don't have in our code right now, though. Do you want me to take it out and simplify it?