Updated to new lex.