As per offline discussion with Marc, we should avoid helper functions to leak into the features.h file (apart from those that directly parse the param string into an enum).

Please remove it from there.