More fixes for clang-format's multiline comment breaking.