avoid repeating tokenization of the selector string if it has not changed (jdalton)
avoid repeating tokenization of the selector string if it has not changed (jdalton)

dperini/nwmatcher,dperini/nwmatcher,dperini/nwmatcher