Fix YAML dump.
Enhance YAML output.