r11485: more use of vff