#495: cli.py and other candy.