Move match_entries out of finders to avoid ceres dependency