am a94d7fd1: Merge "Fix topological ordering and use it for optimizations."

* commit 'a94d7fd18a11dc14fe43c5f814115b73d48846c2':
  Fix topological ordering and use it for optimizations.