back to using lexfn/unify rather than generate-specific unify