Bleeding jumbo

Two more or less trivial patches:
The first makes --list=format-methods aware of the new format methods
The second sorts the mapping of old and new format names in benchmark-unify (as a preparation for changing the mappings once we have a final decision about the new format names...