Improve unique_to_each