Move handling of possible values into the option parser