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