Recommitted the same 6 files after modifying the uncrustify settings so that braces around single statement conditional blocks are only removed if the single statement spans a single line. Braces around multi-line single statements are now preserved.