Fix channel_reestablish generation/handling around next_remote.