Tweaks, simplifications, and some back-to-square-ones.