expanding, and use that info when generating error messages instead of the file info, where appropriate.