Clean up what we store for each match

Check the table row directly above this one, where we say stuff like this:
    &lt;tr class="required annotation">
     &lt;td colspan="3">At least one of &lt;b>team&lt;/b> or &lt;b>card&lt;/b> is required.&lt;/td>
   &lt;/tr>