Namespace simplification.