Add clobbered `optional_match` back.

Add back `optional_match`, which got lost somewhere in the mix.