clang-format to reduce diff in another patch.