PR #3579 rewrites Leo's importers. It's now in devel. The generated code is mostly unchanged.
This PR rewrites the main line of the importers. See the first comment of the PR for all details.
Please test the new importers and report any problems. Thanks.
Edward