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

* commit '2ac3e8174da22f7b330642a2a6e9b56b4dc5b9d2':
  Quick: Rewrite type inference pass.