Simplify logic.

A normalized substring search seems better than using word boundaries as the
former can support multi-word phrases.