Minor refactoring of XML import code