Fix command line option parsing

Force the usage of tuples when parsing command line options. Thanks
JRD!