fixup! Reify state/set handling in squash