Add line / column info to Tokens