Fix anomaly on uncatched NotASort in retyping, and inverse order of evar assignment
in w_merge to follow the unification order (fixes #49).