Comment 4 for bug 699995

Any takers welcome to give this a go. The main task here is to collect cases where this works and where it doesn't and unit test it. And then find a way to integrate it by default that doesn't occupy permanent space.