Yet more changes to the ratebook importer