Cleaning up the command-line business.