Looks like s->num and s->order_id will always be the same now, right? Lets remove the order_id then. It was added as a last minute change before a big release (maybe 1.0) to fix a bug, so it was a hack from the start.