Reify state/set handling in squash
Merge pull request #487 from ambiata/topic/reduction-set-handling

Reify the squash state/set logic