Same optimization as 38b8025, non-indexed.

Only check for matches that can be improvements.