Code style change: always use { and } for blocks

After trying this on other projects, I noticed that there are cases where
the extra verboseness pays off, especially with multiple levels of
indentation.