Switch to ImmutableArrays