If we are ensuring `short_message` and `destination_addr` are both of type `str` (not unicode), should we be doing that for the other fields? That's probably not in the scope of this PR though, so not sure how important it is that we fix that now.