#3286 - PoisonPill instead of Terminate + endpoint cleanup

Switching to PoisonPill could make a difference for queued messages.
Since I have no way to reproduce I'm stabbing westwards...

Also cleaned up a bit of var-twiddling