No, never omit braces.

The indentation does need to be adjusted, though, but braces should never be omitted, or things like #4410 happen.