change tretment of Tpoly and Tunivar in unify