Squash some commits together.
Merge.