More tidying up on oai-pmh importer. Work in progress