Slowly getting back to this again, here improving the error messages when pattern matching on options/non-options, and vice versa:
Match on option, but is not option
Match on value, but is actually option
Match on option, but is not option
Match on value, but is actually option