Prettify, and squash changes.