Fix one element tuple to be actually tuple.

While in this case it doesn't mean much (neither `z` or `-` would be
passed to options parser), it makes things possibly less buggy.
Merge remote-tracking branch 'upstream/master'