Pidns: make full use of xxx_vnr() calls