Avoid excessive rewrites in merge-recursive