Make arguments more consistently