Various clang-format-guided cleanups.

Some variable and function names have been shortened, either because
they were too long, or because they were too long.  They were too
damned long, guys.

r? @LordAro 
x2