Placate Arthur: Write factor IDs as well as names.
Placate Arthur: Write factor IDs as well as names.

This breaks the Merge utility, which I'll fix next.

It also obsoletes the format of all the raw-output committed up to now.
orc-lang/orc,orc-lang/orc,orc-lang/orc,orc-lang/orc,orc-lang/orc