[cvs-nhc98] Thread filenames through for error-reporting.