Namespaced enums, switched out deprecated *_with() methods.