Code style: ensured if blocks have {}

This code style change hunts some oneliner construction to expand them
to more natural block construction.

e.g. if (condition) doSomething(); now becomes:

if (condition) {

doSomething();

}