[LCG] Ran clang-format over this too and it pointed out some fixes.