More work on the command-line interface.