Clean up namespaces, parsing helpers.