YAML integration and collapse the message some.