Merge pull request #1415 from nico/readident

Improve location of error messages around identifiers.