Work on eliminating Z from varbound

All broken currently.