Fix more g->z accesses so the z_at map is used.