Reduce awkwardness of column number tracking in lexer