Some VRF fiddling

Hope this doesn't fudge anything up. Somewhat in line with switching the
output for the default VRF from having "None" to using vrf_id 0.