Enhance unification a bit