Redo parser logic to use a 3 argument OSDCapMatch ctor