Rename ZUniSet_T-->UniSet.
Fix some includes and macros.
Move this.
Rename ZSocketWatcher-->SocketWatcher.
Conform to changes elsewhere.
These all have updated Chan-ish versions elsewhere.