You did get answers. As someone said, since those changes would impact the GE they are unlikely to be even considered in the short term.
That said, as I wrote, Marin could play around with coefficients that are already there and should influence the substitution patterns. Hopefully that's enough to find a viable solution. I don't know if he has any plan to try that, though.