Fix some inconsistent command line options.