Merge pull request #1759 from bdon/graph-map

Minor refactor of Graph; replace uses of Graph.All (slice) with Graph.Map (map)