Continue rework on TRE parser.