More intelligible command line parameters.

at the cost of some code duplication