OK. I'm inclined to do this after the CF finishes, to avoid collisions with other patches. I assume it's going to make the CFbot fairly unhappy.
+1 for proceeding that way. (I did not look at whether the proposed changes are sane, but I agree that this'll inevitably break a lot of pending patches.)
