Rename more sorted_hash stuff from set to hash.