Minor refactoring of Import.