Obviously that's not up to me to decide, but I'm not in a hurry!
I kind of figured that it might cause some problems with your PR, but since it hasn't landed yet it didn't make much sense for me to try and avoid conflicts with code that still might change.
From a cursory look at your PR, it does seem that there would only be minimal changes required to the above.

I should probably have pointed out that if my PR landed before #2660, I intended to revisit this and fix any breakage!