Clean up what we store for each match

Well, I prefer to name things descriptively. Especially since they're not _really_ join tables.

If you strongly prefer your scheme, though, I'm not married to mine.