Start file loc at 1,1 instead of 0,1
Don't reconstruct file locs on building a token