R4R: upgrade tweaks

* ConnectionStream manages upgrades. I think this makes the most sense.