Include chunked messages in unpack again and leave unpack_complete for
unchunked messages. Also, use match statements better... learning!