Clean up implementation after removal of TradeType.
Clean up implementation as API has changed. Use ImmutableLists where necessary.
Relocate the should be comment.