Don't discard non-conflicting substring matches

We should only do this when we would actually end up with conflicting results.

Interestingly this was only caught by the FreeBSD unit tests, not by the Linux ones.