Also fix a few stray clang-format formatting errors that passed
through CI unnoticed.