Fix several small errors in the lexing.