Removed some unnecessary overhead in ExpressionDialog