Fix YAML circular reference handling from previous commit