[RDY] prefer enums over incremental defines