Change copier behaviour to better accommodate copying into very similar contexts (i.e. hardly different branches)