Cleanup kill/death counts

fixes #3417 on the way.