Small changes to TraderExpression