switch to sets for holding vars when prepping, related changes to
`unifier` and `unifier*`