More fixes for enum namespaces.