Small changes in cli.py and yml_loader.py. (Functions moved.)