Clean up what we store for each match

What is a _required_ annotation?