Handle overlaps better when executing DiffCommands.