WELD-1590 - Use ImmutableSet in more places