ENH: Prefer namespaces instead of static members