Move the data setting in the team initialization functions to the unified data setter.

Note that the value is still set manually from new-data-sorted, and something should probably be done about that.