Tidy up our command line interface.