Cleaning up passes to avoid re-calculation.