Update for latest Diagrams, GHC-7.8