Simplify generate_naive_matches_logic
Get rid of matches ivar