[minor] Use an ImmutableList?