Formatting changes from change to clang-format config