Changed lexing in order to pass new TXT tests.