Uncrustified the rest of code.