Trivial cleanups.

This just clang formats and cleans comments in an area I am about to
post a patch for review.

llvm-svn: 269946