[PATCH v2 0/3] Simplify VBIF handling