Reorganize a bit, and remove the old unification implementation