uncrustify: improvements