[lvm2-commits] master - Revert "cleanup: simplify option matching function"