[SRE] Improved token fixups processing.