So, I let more time go by and now many of the patches in this MR are arguably moot, since we're going to get rid of the related code altogether; I can drop those.
The other option is to keep them in the MR (and resubmit soon!) so that the code is in a better shape when it's eventually removed.
Let me know which one you prefer.
Whichever is easier for you :-)
Dropping 10/10 is probably best, at least, since clipping emulation will be obsolete now.