Addressing a couple of TODOs.
The straightforward solution for a problem related to issue 28 will really
clutter send_packet.
I have decided to do it the hard way, so I need to checkpoint this in case I
mess something up.