Thorough testing should catch all those "interestig" issues.

But easier maintainability I also favor braces everywhere.