Tidy up z-* dependencies, except msg and textblock dependence on term