fixup! WIP: Fix state/set handling in squash