Fix PathValueBuilder to properly handle var-length expansions with OPTIO...

...NAL MATCH