Minor fiddling.
More work on the complex importer.