Fix several cases of wonky indentation.

I gave up on changing the weird alignments like:

    const int foo = 1;
          int bar = 0;
Fix braces.

This reminds me that we should standardise on rules for braces in
expressions, particularly multi-line lambdas and initializer lists.