Comment 6 for bug 634941

I'm not convinced of any particular change that would not actually make things more complicated in other ways or for other cases. It is just a much more complicated task than it seems on the surface.