Make handshake take mut self

This should kill any active borrows.