Improve our resolver_match lookup.

The resolver_match lookup wasn't correct. We were still failing if it
was None, since we were only checking for existence.