Make --delete-excluded work better with --filter=merge.