Tweaking the way we parse yaml.