Added 1-indexed line number, and line pos attributes to tokens.