Tidied up some more diagrams.