am 76ce0f8d: am b19c1e66: Merge "Revert "Revert "Quick: Rewrite type inference pass."""

* commit '76ce0f8d201f9f05216b03bfd325dfbd32b943b1':
  Revert "Revert "Quick: Rewrite type inference pass.""