Improve sorter to not destroy things by accident.