Some work on our CLI code (#199).