This set provides various fixes for some corner cases where socket c/r will currently fail. This clears up all but one of the TODO items in the code.