More tweaks to tokenizing.