updates to diagrams-haddock examples

All build now; still some issues to resolve (see https://trello.com/c/G7XmAwEY).