Mister X in The Girl Who Was Death wasn't really poisoned was he? Surely it was simply a sticker at the bottom of the glass saying;
The girl who was death could have persuaded the barmaid Doris to stick the sticker on the bottom of the glass as a jolly jape. Poisoned or not, the result would be the same!
Be seeing you