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

* commit '1f02f1a7b3073b8fef07770a67fbf94afad317f0':
  Quick: Rewrite type inference pass.