Clean up some namespace handling