Convert macro+enum into a simple enum: Currently the enum was filled using a