improve source location reporting in 2dmatch for empty cells

to make this happen, change the 2d reader so that it puts more
specific source location information into the read form