Consistently use braces around conditional bodies, even
if they're only once line. After the Apple goto bug,
we know relying on indentation alone to signal what
lines are inside the block is too error-prone.

Also cuddle else clauses with the closing braces.