Changes to build against Diagrams-1.0