154c154
< safe_cast<RubyPort::SenderState *>(pkt->senderState);
---
> safe_cast<RubyPort::SenderState *>(pkt->popSenderState());
157,159d156
<
< // pop the sender state from the packet
< pkt->senderState = senderState->saved;
190c187
< pkt->senderState = new SenderState(this, pkt->senderState);
---
> pkt->pushSenderState(new SenderState(this));
233c230
< pkt->senderState = senderState->saved;
---
> pkt->senderState = senderState->predecessor;
308c305
< pkt->senderState = senderState->saved;
---
> pkt->senderState = senderState->predecessor;