Cosmetic fixes.

This pull request contains the previously discussed alternation of indentation + a couple of teeny-tiny stylistic improvements.