Be more strict in how we check out the tags.