Add vp_length macro (makes it easier to backport changes from master)
Change references to vp->length to vp->vp_length