Remove TODO about matcher_tag; it's not such a bad way of doing things