Cleaning up list/set collection types