Adapt for new shipper options.