Adjust command line options to make better use of logging features