Include suggested changes by clang-tidy