Remove dependence on order.