Reformat a few things for wider lines.