Use more idiomatic command line options.