Fix some formatting

Most of this is util/checkwhite and util/unbrace, with some corrections
were those scripts reformatted the code incorrectly.