Refactoring rendezvous to accept messages without rsm