Style consistency fixes.

 - Put a blank line after the initial declarations in functions.

 - Put a blank line before 'return' in non-trivial blocks.

 - Reduce the "scope" of macros in tests further.

 - Align continuation lines where it makes sense instead of always using
   the same indent. Less consistent, but some places looked messy
   before.

 - Misc. nits elsewhere.