António Fernandes authored Jul 11, 2021 and António Fernandes committed Jul 11, 2021

There are a few non-braced single-statement in the final cases, which
have  gone unnoticed until detected by a recent uncrustify update.

Let's add the missing braces around single-statements even if it's the
last case.