Deal with slight differences in YAML serialization in 2.1.