Switch C99->C1X (C11)
Move length out of the VALUE_PAIR structure
Change references to vp->length to vp->vp_length