Added more lexing.