Some importer refactorings