CLP update: Expose the whole matched option.

Not just the option number.