Tweak string tokenizing to include apostrophe