Better deprecation of old enum values