This is a complicated solution for a theoretical problem. Most people will be shy to admit this, but I can't foresee the possible consequences. I'd rather see one change implemented at a time, so we can tell what the cause is if something goes wrong.