clang-format: Address review comments of r216501.