I've put together two patches which fix the problems I mention below.

I'd like to apply these patches, but I fear that they may cause
unanticipated export problems.  I'd be much more comfortable if someone
who knows a little more about the exporters could take a look at these.

Thanks -- Eric