> Right now I believe that (1) is the most reasonable
>
Somethine like in the attached patch. I haven't tested it yet in real 
migration scenario though



-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko