More code style conversion to always use { and }

Continue what commit 8caae3f672b20b407eac2e904471b0940358e701 started.