Move to rendezvous package, remove race conditions with broadcasts, other cleanups.