Further conversions from static to anonymous namespaces