Rework the text parser.