Clean up logic of the option matcher in Brainstem.Expectation