Reformat and (slightly) decruft all the things.