chore: Enforce bracing around blocks. Generally considered easier to read and less error prone.

chore: Enforce bracing around blocks. Generally considered easier to read and less error prone. #7090