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

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