I'm sending updated version of the patch.

Note: there are some (tree)const_cast<tree> (t2) casting. I've got a clean up
patch for that which will improve it.

Martin