Tweaks to no-whitespace strategy for text matching