Fix some issues with braces.