Some more work on lexing