Fix some issues caused by uncrustify.