Renamed magic_order_key to order_key.