fixup! Extract OutputFormat to FileFormat for ingest re-use