WELD-1753 More changes to ImmutableSet