Cleanup the (almost there) dgram patch.