But only for the `import_export` module for now, where we know
this has been a problem before.

Also fixed the 3 problems it found.