Move C++-only functionality into the newly-conventional namespaces.