More cleaning up after the command line refactoring.