clang-format on feature-predicate updates