Clean up what we store for each match

Hm, you mean, if we don't want to record individual statistics for a match? Do we really want to support that?

I don't want to have both. Then the data could be inconsistent.