Fixed option parsing for high arity values, and added corresponding test.

When parsing option token values in high arity options it would not stop
parsing options if it found another option - it would parse it as option
value. Now it is flexible in the number of option values, and it stops
parsing option values if another valid option is found.