Several fiddled fixes to get Graph and VersionedGraph running.