More code style conversion to always use { and }

Continue what commit 2919e4a4face1bd19301b6bd9cf29ba94a4d7fc8 started.