Some work on pick handling in diagrams.