graph/{multi,simple}: harmonise code organisation

Created by: kortschak

This helps prevent the kind of errors that I found while doing this; the incomplete fix-up when removing the Has method.

Review requires no specific graph experience as it's almost entirely just text reordering.

Please take a look.

Updates #616.