r23795: more v2->v3 conversion