Update the graphml drawing output format to the diagram way.
Right.  Macros (list require-distinct) can register lists of things as
diagram parts.