Fix overzealous conversion from Z to VIO_Z.