Add braces/style fixes.
Style changes for single-line braces.