Tweaked tokenizing to ignore apostrophes (workaround)