simplified a case of unify; added a todo