am 745e055c: am 1f02f1a7: Merge "Quick: Rewrite type inference pass."

* commit '745e055cc12b1eb7c0387ae114dd751854f7f71f':
  Quick: Rewrite type inference pass.