freedom from some macro evils

The Enum isn't used anyway in DC