Based on the feedback here, I have put up a clean proposal to migrate the entirety (everything that exist in v2.1) of the v2.1 surplus to v3. I think this serves as a good alternative to this proposal: