Modifications in the lexer