Expanded Rendezvous handling a bit.