Hmm. Yes. Very good points. I'll raise an issue about how much is undone, but this definitely does highlight that the performance is more critical here than I originally thought. Would you pref the performance fix in this PR or a separate one?