Tokenising should now support digraphs. Not used or tested.