Cleanly support YAML