Some importer refactoring.