Repair short and long options argument definitions to be consistent.

[joluxer]

Experimenting with a couple of command line options I noticed inconsistencies in the behavior, such as swallowing other options or not using option arguments.

Some minor digging showed inconsistencies, which should be solved in the presented pull-request.

Best regards, Jo.

[cbrake]

Thanks!