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

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