In match block allows option override where first argument could be specific keyword (bug fix).

Use modification to unify processing of all single string array options.
Remove needless check for empty option after parsing.

(inspired)