[PM] Run clang-format on a few lines that I missed in my first pass,
pulling them under 80-columns. No functionality changed.