pre- and post-increments (in progress); lexer cleanup