More YAML refactoring.