Reorder some more to isolate implementation of the two-way communication channel.