setup.py, CLI cleanup.