Update according to TradeOffer refactorings.