Would you be willing to apply your patch to tree-ssa at the same time? I don't currently have that branch checked out or have set up testing procedures for it, so I think that would be a bad idea.