Finalizing transition from Marshal to YAML
Replace random IDs with non-empty literals