Add column numbers to tokens, fixes #19