Pass the entry down into the core write loop, so we
can include the filename when reporting errors.

Thanks to: Dan Nelson