Add braces around single-statement if/while bodies