Make diagram example use GraphViz utilities.  Also hlint cleanup.