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

* commit '35fe00eee7bd7229be502f2cde064c36f981a36b':
  Revert "Revert "Quick: Rewrite type inference pass.""