Some more uncrustify correcting.