block: properly handle vlist_add() for label, uuid and device cases