Prefer curly braces, even for short if expressions

I think it's a good idea to use curly braces for short if expressions, to more clearly separate code that should be executed inside and outside if expressions.