Simplify FEATURE_DEFINES definition