Update to use new "immutable" collection type.