Add braces in else clauses.

Missing a few braces around expressions that should be incorporated in an else clause. Caught by a newer version of the compiler.