Move some term stuff into z-term