Cleanup for Order.contains() method