Fix a regression in recent changes to improve cleanup of compiler temporary data