- move over to env for unify et al - fix issue where constraint had short context - drop parameters block - make it clear where context is being used