Reorganize a bit in preparation for protocol change.