cleanup some of the definitions/interfaces

- focused on unification and vars_to_uvars.