Cleaning up namespaces a bit.