o Some suggestions from uncrustify.