Adjustment to token definition for regexes