Fix some issues with the automatic reformat.