Maybe there's not much duplication anyway -- I am judging based only on the diffs I see, not the whole files.