Work with newest go-lex, and add line number