[PM] While I'm here, fix a few other clang-format issues. Pulls some
lines under 80-columns, etc.