Merge "Avoid excessive spill slots for slow paths."