Simplify position handling and comment end lexing