Fixed: Issue with overlapping T_* identifiers.