Note that we don't actually appear to be setting a session id (which is fine, I think). We're using the from_addr to make a guess about the session *event*. Comment in the tests needs updating too.