avarice: fix trade reorder/cleanup