Moved last bit of graph construction logic to buildGraph.