Some cleanup of datapath diagrams.