am 7c2e21d9: Merge "Fix some bugs in graph construction/simplification methods."

* commit '7c2e21d9e39c6b6cf0c5bdff0101fc70c202c908':
  Fix some bugs in graph construction/simplification methods.