Bring some consistency to command line switches