r11481: make vff macro more efficient