Minor revisions to improve performance on importer and seletion mutator.