Pet peeve alert: There's no such thing as 'optional braces' ;-)

We try to stick to PSR-2 as much as possible, so every `if` should have braces: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md