More replace vp->lvalue with vp->vp_*