Improve variable regexes in language grammar.