Agreed. That would solve all of my concerns. It would also allow for real team work in tournaments without anyone being concerned about their K/D ratio, i.e. players would be more willing to sacrifice deaths for the good of the team.