Clean-up add_bool_feature
7 files changed