r23791: found some more v2->v3 conversions