C++ cosmetics

10 files changed, 848 insertions, 1073 deletions

diff --git a/protocols/WhatsApp/src/appsync.cpp b/protocols/WhatsApp/src/appsync.cpp
index 0a03978289..8282317b4d 100644
--- a/protocols/WhatsApp/src/appsync.cpp
+++ b/protocols/WhatsApp/src/appsync.cpp
@@ -94,12 +94,12 @@ void WhatsAppProto::OnIqServerSync(const WANode &node)
 		CMStringW wszSnapshotPath(GetTmpFileName("collection", pszName));
 		if (auto *pSnapshot = coll->getChild("snapshot")) {
 			proto::ExternalBlobReference body(pSnapshot->content);
-			if (!body.directpath || !body.has_mediakey) {
+			if (!body->directpath || !body->has_mediakey) {
 				debugLogA("Invalid snapshot data, skipping");
 				continue;
 			}
 
-			MBinBuffer buf = DownloadEncryptedFile(directPath2url(body.directpath), body.mediakey, "App State");
+			MBinBuffer buf = DownloadEncryptedFile(directPath2url(body->directpath), body->mediakey, "App State");
 			if (!buf.data()) {
 				debugLogA("Invalid downloaded snapshot data, skipping");
 				continue;
@@ -107,12 +107,12 @@ void WhatsAppProto::OnIqServerSync(const WANode &node)
 
 			proto::SyncdSnapshot snapshot(buf);
 
-			dwVersion = snapshot.version->version;
+			dwVersion = snapshot->version->version;
 			if (dwVersion > pCollection->version) {
 				pCollection->hash.init();
 				debugLogA("%s: applying snapshot of version %d", pCollection->szName.get(), dwVersion);
-				for (int i=0; i < snapshot.n_records; i++)
-					ParsePatch(pCollection, snapshot.records[i], true);
+				for (int i=0; i < snapshot->n_records; i++)
+					ParsePatch(pCollection, snapshot->records[i], true);
 			}
 			else debugLogA("%s: skipping snapshot of version %d", pCollection->szName.get(), dwVersion);
 		}
@@ -121,11 +121,11 @@ void WhatsAppProto::OnIqServerSync(const WANode &node)
 			for (auto &it : pPatchList->getChildren()) {
 				proto::SyncdPatch patch(it->content);
 
-				dwVersion = patch.version->version;
+				dwVersion = patch->version->version;
 				if (dwVersion > pCollection->version) {
 					debugLogA("%s: applying patch of version %d", pCollection->szName.get(), dwVersion);
-					for (int i = 0; i < patch.n_mutations; i++) {
-						auto &jt = *patch.mutations[i];
+					for (int i = 0; i < patch->n_mutations; i++) {
+						auto &jt = *patch->mutations[i];
 						ParsePatch(pCollection, jt.record, jt.operation == WA__SYNCD_MUTATION__SYNCD_OPERATION__SET);
 					}
 				}
@@ -186,8 +186,8 @@ void WhatsAppProto::ParsePatch(WACollection *pColl, const Wa__SyncdRecord *rec,
 	// debugLogA("Applying patch for %s{%d}: %s", pColl->szName.get(), data.version, data.Utf8DebugString().c_str());
 
 	if (bSet) {
-		JSONNode jsonRoot = JSONNode::parse((char*)data.index.data);
-		ApplyPatch(jsonRoot, data.value);
+		JSONNode jsonRoot = JSONNode::parse((char*)data->index.data);
+		ApplyPatch(jsonRoot, data->value);
 
 		pColl->hash.add(macValue, 32);
 		pColl->indexValueMap[index] = std::string((char*)macValue, 32);
diff --git a/protocols/WhatsApp/src/iq.cpp b/protocols/WhatsApp/src/iq.cpp
index 5b059d68e0..6b5384dc90 100644
--- a/protocols/WhatsApp/src/iq.cpp
+++ b/protocols/WhatsApp/src/iq.cpp
@@ -137,8 +137,8 @@ void WhatsAppProto::OnIqPairSuccess(const WANode &node)
 		if (auto *pIdentity = pRoot->getChild("device-identity")) {
 			proto::ADVSignedDeviceIdentityHMAC payload(pIdentity->content);
 
-			auto &hmac = payload.hmac;
-			auto &details = payload.details;
+			auto &hmac = payload->hmac;
+			auto &details = payload->details;
 			{
 				// check details signature using HMAC
 				uint8_t signature[32];
@@ -151,9 +151,9 @@ void WhatsAppProto::OnIqPairSuccess(const WANode &node)
 
 			proto::ADVSignedDeviceIdentity account(details);
 
-			auto &deviceDetails = account.details;
-			auto &accountSignature = account.accountsignature;
-			auto &accountSignatureKey = account.accountsignaturekey;
+			auto &deviceDetails = account->details;
+			auto &accountSignature = account->accountsignature;
+			auto &accountSignatureKey = account->accountsignaturekey;
 			{
 				MBinBuffer buf;
 				buf.append("\x06\x00", 2);
@@ -179,8 +179,8 @@ void WhatsAppProto::OnIqPairSuccess(const WANode &node)
 				if (curve_calculate_signature(m_signalStore.CTX(), &result, &key, (BYTE *)buf.data(), buf.length()) != 0)
 					throw "OnIqPairSuccess: cannot calculate account signature, exiting";
 
-				account.devicesignature = proto::SetBinary(result->data, result->len);
-				account.has_devicesignature = true;
+				account->devicesignature = proto::SetBinary(result->data, result->len);
+				account->has_devicesignature = true;
 				signal_buffer_free(result);
 			}
 
@@ -193,7 +193,7 @@ void WhatsAppProto::OnIqPairSuccess(const WANode &node)
 				db_set_blob(0, m_szModuleName, "SignalIdentifierKey", key.data(), (int)key.length());
 			}
 
-			proto::CleanBinary(account.accountsignaturekey); account.has_accountsignaturekey = false;
+			proto::CleanBinary(account->accountsignaturekey); account->has_accountsignaturekey = false;
 			MBinBuffer accountEnc(proto::Serialize(account));
 
 			proto::ADVDeviceIdentity deviceIdentity(deviceDetails);
@@ -203,7 +203,7 @@ void WhatsAppProto::OnIqPairSuccess(const WANode &node)
 			WANode *nodePair = reply.addChild("pair-device-sign");
 
 			WANode *nodeDeviceIdentity = nodePair->addChild("device-identity");
-			nodeDeviceIdentity->addAttr("key-index", deviceIdentity.keyindex);
+			nodeDeviceIdentity->addAttr("key-index", deviceIdentity->keyindex);
 			nodeDeviceIdentity->content.append(accountEnc.data(), accountEnc.length());
 			WSSendNode(reply);
 		}
@@ -263,9 +263,9 @@ LBL_Error:
 		return;
 	}
 
-	auto &static_ = msg.serverhello->static_;
-	auto &payload_ = msg.serverhello->payload;
-	auto &ephemeral_ = msg.serverhello->ephemeral;
+	auto &static_ = msg->serverhello->static_;
+	auto &payload_ = msg->serverhello->payload;
+	auto &ephemeral_ = msg->serverhello->ephemeral;
 
 	m_noise->updateHash(ephemeral_.data, ephemeral_.len);
 	m_noise->mixIntoKey(m_noise->ephemeral.priv.data(), ephemeral_.data);
@@ -274,8 +274,8 @@ LBL_Error:
 	m_noise->mixIntoKey(m_noise->ephemeral.priv.data(), decryptedStatic.data());
 
 	proto::CertChain cert(m_noise->decrypt(payload_.data, payload_.len));
-	proto::CertChain__NoiseCertificate__Details details(cert.intermediate->details);
-	if (details.issuerserial != 0) {
+	proto::CertChain__NoiseCertificate__Details details(cert->intermediate->details);
+	if (details->issuerserial != 0) {
 		debugLogA("Invalid certificate serial number, exiting");
 		goto LBL_Error;
 	}
@@ -309,7 +309,7 @@ LBL_Error:
 		companion.platformtype = WA__DEVICE_PROPS__PLATFORM_TYPE__DESKTOP; companion.has_platformtype = true;
 		companion.requirefullsync = false; companion.has_requirefullsync = true;
 
-		MBinBuffer buf(proto::Serialize((ProtobufCMessage*)&companion));
+		MBinBuffer buf(proto::Serialize(&companion));
 		auto szRegId(encodeBigEndian(getDword(DBKEY_REG_ID)));
 		auto szKeyId(encodeBigEndian(m_signalStore.preKey.keyid));
 
@@ -360,7 +360,7 @@ LBL_Error:
 	node.useragent = &userAgent;
 	node.webinfo = &webInfo;
 
-	MBinBuffer payload(proto::Serialize((ProtobufCMessage*)&node));
+	MBinBuffer payload(proto::Serialize(&node));
 	MBinBuffer payloadEnc = m_noise->encrypt(payload.data(), payload.length());
 
 	Wa__HandshakeMessage__ClientFinish finish = WA__HANDSHAKE_MESSAGE__CLIENT_FINISH__INIT;
@@ -369,7 +369,7 @@ LBL_Error:
 
 	Wa__HandshakeMessage handshake = WA__HANDSHAKE_MESSAGE__INIT;
 	handshake.clientfinish = &finish;
-	WSSend((ProtobufCMessage *)&handshake);
+	WSSend(handshake);
 
 	m_noise->finish();
 }
diff --git a/protocols/WhatsApp/src/message.cpp b/protocols/WhatsApp/src/message.cpp
index d1473f2057..2479ba0458 100644
--- a/protocols/WhatsApp/src/message.cpp
+++ b/protocols/WhatsApp/src/message.cpp
@@ -130,13 +130,13 @@ void WhatsAppProto::OnReceiveMessage(const WANode &node)
 			iDecryptable++;
 
 			proto::Message encMsg(msgBody.data(), msgBody.len());
-			if (encMsg.devicesentmessage)
-				msg.message = encMsg.devicesentmessage->message;
+			if (encMsg->devicesentmessage)
+				msg.message = encMsg->devicesentmessage->message;
 			else
-				msg.message = &encMsg;
+				msg.message = encMsg;
 
-			if (encMsg.senderkeydistributionmessage)
-				m_signalStore.processSenderKeyMessage(encMsg.senderkeydistributionmessage);
+			if (encMsg->senderkeydistributionmessage)
+				m_signalStore.processSenderKeyMessage(encMsg->senderkeydistributionmessage);
 
 			ProcessMessage(type, msg);
 
@@ -326,7 +326,7 @@ int WhatsAppProto::SendTextMessage(const char *jid, const char *pszMsg)
 	Wa__Message msg = WA__MESSAGE__INIT;
 	msg.devicesentmessage = &sentBody;
 
-	MBinBuffer encMsg(proto::Serialize((ProtobufCMessage*)&msg));
+	MBinBuffer encMsg(proto::Serialize(&msg));
 
 	WANode payLoad("message");
 	payLoad << CHAR_PARAM("id", szMsgId) << CHAR_PARAM("type", "text") << CHAR_PARAM("to", jid);
diff --git a/protocols/WhatsApp/src/pmsg.pb-c.c b/protocols/WhatsApp/src/pmsg.pb-c.cpp
index 6169381a17..d9818f8907 100644
--- a/protocols/WhatsApp/src/pmsg.pb-c.c
+++ b/protocols/WhatsApp/src/pmsg.pb-c.cpp
@@ -16,21 +16,21 @@ void   wa__advdevice_identity__init
 size_t wa__advdevice_identity__get_packed_size
                      (const Wa__ADVDeviceIdentity *message)
 {
-  assert(message->base.descriptor == &wa__advdevice_identity__descriptor);
+  assert(message->descriptor == &wa__advdevice_identity__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__advdevice_identity__pack
                      (const Wa__ADVDeviceIdentity *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__advdevice_identity__descriptor);
+  assert(message->descriptor == &wa__advdevice_identity__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__advdevice_identity__pack_to_buffer
                      (const Wa__ADVDeviceIdentity *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__advdevice_identity__descriptor);
+  assert(message->descriptor == &wa__advdevice_identity__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ADVDeviceIdentity *
@@ -49,7 +49,7 @@ void   wa__advdevice_identity__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__advdevice_identity__descriptor);
+  assert(message->descriptor == &wa__advdevice_identity__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__advkey_index_list__init
@@ -61,21 +61,21 @@ void   wa__advkey_index_list__init
 size_t wa__advkey_index_list__get_packed_size
                      (const Wa__ADVKeyIndexList *message)
 {
-  assert(message->base.descriptor == &wa__advkey_index_list__descriptor);
+  assert(message->descriptor == &wa__advkey_index_list__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__advkey_index_list__pack
                      (const Wa__ADVKeyIndexList *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__advkey_index_list__descriptor);
+  assert(message->descriptor == &wa__advkey_index_list__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__advkey_index_list__pack_to_buffer
                      (const Wa__ADVKeyIndexList *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__advkey_index_list__descriptor);
+  assert(message->descriptor == &wa__advkey_index_list__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ADVKeyIndexList *
@@ -94,7 +94,7 @@ void   wa__advkey_index_list__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__advkey_index_list__descriptor);
+  assert(message->descriptor == &wa__advkey_index_list__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__advsigned_device_identity__init
@@ -106,21 +106,21 @@ void   wa__advsigned_device_identity__init
 size_t wa__advsigned_device_identity__get_packed_size
                      (const Wa__ADVSignedDeviceIdentity *message)
 {
-  assert(message->base.descriptor == &wa__advsigned_device_identity__descriptor);
+  assert(message->descriptor == &wa__advsigned_device_identity__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__advsigned_device_identity__pack
                      (const Wa__ADVSignedDeviceIdentity *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__advsigned_device_identity__descriptor);
+  assert(message->descriptor == &wa__advsigned_device_identity__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__advsigned_device_identity__pack_to_buffer
                      (const Wa__ADVSignedDeviceIdentity *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__advsigned_device_identity__descriptor);
+  assert(message->descriptor == &wa__advsigned_device_identity__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ADVSignedDeviceIdentity *
@@ -139,7 +139,7 @@ void   wa__advsigned_device_identity__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__advsigned_device_identity__descriptor);
+  assert(message->descriptor == &wa__advsigned_device_identity__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__advsigned_device_identity_hmac__init
@@ -151,21 +151,21 @@ void   wa__advsigned_device_identity_hmac__init
 size_t wa__advsigned_device_identity_hmac__get_packed_size
                      (const Wa__ADVSignedDeviceIdentityHMAC *message)
 {
-  assert(message->base.descriptor == &wa__advsigned_device_identity_hmac__descriptor);
+  assert(message->descriptor == &wa__advsigned_device_identity_hmac__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__advsigned_device_identity_hmac__pack
                      (const Wa__ADVSignedDeviceIdentityHMAC *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__advsigned_device_identity_hmac__descriptor);
+  assert(message->descriptor == &wa__advsigned_device_identity_hmac__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__advsigned_device_identity_hmac__pack_to_buffer
                      (const Wa__ADVSignedDeviceIdentityHMAC *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__advsigned_device_identity_hmac__descriptor);
+  assert(message->descriptor == &wa__advsigned_device_identity_hmac__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ADVSignedDeviceIdentityHMAC *
@@ -184,7 +184,7 @@ void   wa__advsigned_device_identity_hmac__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__advsigned_device_identity_hmac__descriptor);
+  assert(message->descriptor == &wa__advsigned_device_identity_hmac__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__advsigned_key_index_list__init
@@ -196,21 +196,21 @@ void   wa__advsigned_key_index_list__init
 size_t wa__advsigned_key_index_list__get_packed_size
                      (const Wa__ADVSignedKeyIndexList *message)
 {
-  assert(message->base.descriptor == &wa__advsigned_key_index_list__descriptor);
+  assert(message->descriptor == &wa__advsigned_key_index_list__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__advsigned_key_index_list__pack
                      (const Wa__ADVSignedKeyIndexList *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__advsigned_key_index_list__descriptor);
+  assert(message->descriptor == &wa__advsigned_key_index_list__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__advsigned_key_index_list__pack_to_buffer
                      (const Wa__ADVSignedKeyIndexList *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__advsigned_key_index_list__descriptor);
+  assert(message->descriptor == &wa__advsigned_key_index_list__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ADVSignedKeyIndexList *
@@ -229,7 +229,7 @@ void   wa__advsigned_key_index_list__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__advsigned_key_index_list__descriptor);
+  assert(message->descriptor == &wa__advsigned_key_index_list__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__action_link__init
@@ -241,21 +241,21 @@ void   wa__action_link__init
 size_t wa__action_link__get_packed_size
                      (const Wa__ActionLink *message)
 {
-  assert(message->base.descriptor == &wa__action_link__descriptor);
+  assert(message->descriptor == &wa__action_link__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__action_link__pack
                      (const Wa__ActionLink *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__action_link__descriptor);
+  assert(message->descriptor == &wa__action_link__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__action_link__pack_to_buffer
                      (const Wa__ActionLink *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__action_link__descriptor);
+  assert(message->descriptor == &wa__action_link__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ActionLink *
@@ -274,7 +274,7 @@ void   wa__action_link__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__action_link__descriptor);
+  assert(message->descriptor == &wa__action_link__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__auto_download_settings__init
@@ -286,21 +286,21 @@ void   wa__auto_download_settings__init
 size_t wa__auto_download_settings__get_packed_size
                      (const Wa__AutoDownloadSettings *message)
 {
-  assert(message->base.descriptor == &wa__auto_download_settings__descriptor);
+  assert(message->descriptor == &wa__auto_download_settings__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__auto_download_settings__pack
                      (const Wa__AutoDownloadSettings *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__auto_download_settings__descriptor);
+  assert(message->descriptor == &wa__auto_download_settings__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__auto_download_settings__pack_to_buffer
                      (const Wa__AutoDownloadSettings *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__auto_download_settings__descriptor);
+  assert(message->descriptor == &wa__auto_download_settings__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__AutoDownloadSettings *
@@ -319,7 +319,7 @@ void   wa__auto_download_settings__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__auto_download_settings__descriptor);
+  assert(message->descriptor == &wa__auto_download_settings__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__biz_account_link_info__init
@@ -331,21 +331,21 @@ void   wa__biz_account_link_info__init
 size_t wa__biz_account_link_info__get_packed_size
                      (const Wa__BizAccountLinkInfo *message)
 {
-  assert(message->base.descriptor == &wa__biz_account_link_info__descriptor);
+  assert(message->descriptor == &wa__biz_account_link_info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__biz_account_link_info__pack
                      (const Wa__BizAccountLinkInfo *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__biz_account_link_info__descriptor);
+  assert(message->descriptor == &wa__biz_account_link_info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__biz_account_link_info__pack_to_buffer
                      (const Wa__BizAccountLinkInfo *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__biz_account_link_info__descriptor);
+  assert(message->descriptor == &wa__biz_account_link_info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__BizAccountLinkInfo *
@@ -364,7 +364,7 @@ void   wa__biz_account_link_info__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__biz_account_link_info__descriptor);
+  assert(message->descriptor == &wa__biz_account_link_info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__biz_account_payload__init
@@ -376,21 +376,21 @@ void   wa__biz_account_payload__init
 size_t wa__biz_account_payload__get_packed_size
                      (const Wa__BizAccountPayload *message)
 {
-  assert(message->base.descriptor == &wa__biz_account_payload__descriptor);
+  assert(message->descriptor == &wa__biz_account_payload__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__biz_account_payload__pack
                      (const Wa__BizAccountPayload *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__biz_account_payload__descriptor);
+  assert(message->descriptor == &wa__biz_account_payload__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__biz_account_payload__pack_to_buffer
                      (const Wa__BizAccountPayload *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__biz_account_payload__descriptor);
+  assert(message->descriptor == &wa__biz_account_payload__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__BizAccountPayload *
@@ -409,7 +409,7 @@ void   wa__biz_account_payload__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__biz_account_payload__descriptor);
+  assert(message->descriptor == &wa__biz_account_payload__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__biz_identity_info__init
@@ -421,21 +421,21 @@ void   wa__biz_identity_info__init
 size_t wa__biz_identity_info__get_packed_size
                      (const Wa__BizIdentityInfo *message)
 {
-  assert(message->base.descriptor == &wa__biz_identity_info__descriptor);
+  assert(message->descriptor == &wa__biz_identity_info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__biz_identity_info__pack
                      (const Wa__BizIdentityInfo *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__biz_identity_info__descriptor);
+  assert(message->descriptor == &wa__biz_identity_info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__biz_identity_info__pack_to_buffer
                      (const Wa__BizIdentityInfo *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__biz_identity_info__descriptor);
+  assert(message->descriptor == &wa__biz_identity_info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__BizIdentityInfo *
@@ -454,7 +454,7 @@ void   wa__biz_identity_info__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__biz_identity_info__descriptor);
+  assert(message->descriptor == &wa__biz_identity_info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__cert_chain__noise_certificate__details__init
@@ -478,21 +478,21 @@ void   wa__cert_chain__init
 size_t wa__cert_chain__get_packed_size
                      (const Wa__CertChain *message)
 {
-  assert(message->base.descriptor == &wa__cert_chain__descriptor);
+  assert(message->descriptor == &wa__cert_chain__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__cert_chain__pack
                      (const Wa__CertChain *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__cert_chain__descriptor);
+  assert(message->descriptor == &wa__cert_chain__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__cert_chain__pack_to_buffer
                      (const Wa__CertChain *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__cert_chain__descriptor);
+  assert(message->descriptor == &wa__cert_chain__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__CertChain *
@@ -511,7 +511,7 @@ void   wa__cert_chain__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__cert_chain__descriptor);
+  assert(message->descriptor == &wa__cert_chain__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__chain__init
@@ -523,21 +523,21 @@ void   wa__chain__init
 size_t wa__chain__get_packed_size
                      (const Wa__Chain *message)
 {
-  assert(message->base.descriptor == &wa__chain__descriptor);
+  assert(message->descriptor == &wa__chain__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__chain__pack
                      (const Wa__Chain *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__chain__descriptor);
+  assert(message->descriptor == &wa__chain__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__chain__pack_to_buffer
                      (const Wa__Chain *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__chain__descriptor);
+  assert(message->descriptor == &wa__chain__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__Chain *
@@ -556,7 +556,7 @@ void   wa__chain__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__chain__descriptor);
+  assert(message->descriptor == &wa__chain__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__chain_key__init
@@ -568,21 +568,21 @@ void   wa__chain_key__init
 size_t wa__chain_key__get_packed_size
                      (const Wa__ChainKey *message)
 {
-  assert(message->base.descriptor == &wa__chain_key__descriptor);
+  assert(message->descriptor == &wa__chain_key__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__chain_key__pack
                      (const Wa__ChainKey *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__chain_key__descriptor);
+  assert(message->descriptor == &wa__chain_key__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__chain_key__pack_to_buffer
                      (const Wa__ChainKey *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__chain_key__descriptor);
+  assert(message->descriptor == &wa__chain_key__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ChainKey *
@@ -601,7 +601,7 @@ void   wa__chain_key__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__chain_key__descriptor);
+  assert(message->descriptor == &wa__chain_key__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__client_payload__dnssource__init
@@ -649,21 +649,21 @@ void   wa__client_payload__init
 size_t wa__client_payload__get_packed_size
                      (const Wa__ClientPayload *message)
 {
-  assert(message->base.descriptor == &wa__client_payload__descriptor);
+  assert(message->descriptor == &wa__client_payload__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__client_payload__pack
                      (const Wa__ClientPayload *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__client_payload__descriptor);
+  assert(message->descriptor == &wa__client_payload__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__client_payload__pack_to_buffer
                      (const Wa__ClientPayload *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__client_payload__descriptor);
+  assert(message->descriptor == &wa__client_payload__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ClientPayload *
@@ -682,7 +682,7 @@ void   wa__client_payload__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__client_payload__descriptor);
+  assert(message->descriptor == &wa__client_payload__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__context_info__ad_reply_info__init
@@ -706,21 +706,21 @@ void   wa__context_info__init
 size_t wa__context_info__get_packed_size
                      (const Wa__ContextInfo *message)
 {
-  assert(message->base.descriptor == &wa__context_info__descriptor);
+  assert(message->descriptor == &wa__context_info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__context_info__pack
                      (const Wa__ContextInfo *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__context_info__descriptor);
+  assert(message->descriptor == &wa__context_info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__context_info__pack_to_buffer
                      (const Wa__ContextInfo *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__context_info__descriptor);
+  assert(message->descriptor == &wa__context_info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ContextInfo *
@@ -739,7 +739,7 @@ void   wa__context_info__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__context_info__descriptor);
+  assert(message->descriptor == &wa__context_info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__conversation__init
@@ -751,21 +751,21 @@ void   wa__conversation__init
 size_t wa__conversation__get_packed_size
                      (const Wa__Conversation *message)
 {
-  assert(message->base.descriptor == &wa__conversation__descriptor);
+  assert(message->descriptor == &wa__conversation__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__conversation__pack
                      (const Wa__Conversation *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__conversation__descriptor);
+  assert(message->descriptor == &wa__conversation__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__conversation__pack_to_buffer
                      (const Wa__Conversation *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__conversation__descriptor);
+  assert(message->descriptor == &wa__conversation__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__Conversation *
@@ -784,7 +784,7 @@ void   wa__conversation__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__conversation__descriptor);
+  assert(message->descriptor == &wa__conversation__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__device_list_metadata__init
@@ -796,21 +796,21 @@ void   wa__device_list_metadata__init
 size_t wa__device_list_metadata__get_packed_size
                      (const Wa__DeviceListMetadata *message)
 {
-  assert(message->base.descriptor == &wa__device_list_metadata__descriptor);
+  assert(message->descriptor == &wa__device_list_metadata__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__device_list_metadata__pack
                      (const Wa__DeviceListMetadata *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__device_list_metadata__descriptor);
+  assert(message->descriptor == &wa__device_list_metadata__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__device_list_metadata__pack_to_buffer
                      (const Wa__DeviceListMetadata *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__device_list_metadata__descriptor);
+  assert(message->descriptor == &wa__device_list_metadata__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__DeviceListMetadata *
@@ -829,7 +829,7 @@ void   wa__device_list_metadata__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__device_list_metadata__descriptor);
+  assert(message->descriptor == &wa__device_list_metadata__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__device_props__app_version__init
@@ -847,21 +847,21 @@ void   wa__device_props__init
 size_t wa__device_props__get_packed_size
                      (const Wa__DeviceProps *message)
 {
-  assert(message->base.descriptor == &wa__device_props__descriptor);
+  assert(message->descriptor == &wa__device_props__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__device_props__pack
                      (const Wa__DeviceProps *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__device_props__descriptor);
+  assert(message->descriptor == &wa__device_props__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__device_props__pack_to_buffer
                      (const Wa__DeviceProps *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__device_props__descriptor);
+  assert(message->descriptor == &wa__device_props__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__DeviceProps *
@@ -880,7 +880,7 @@ void   wa__device_props__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__device_props__descriptor);
+  assert(message->descriptor == &wa__device_props__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__disappearing_mode__init
@@ -892,21 +892,21 @@ void   wa__disappearing_mode__init
 size_t wa__disappearing_mode__get_packed_size
                      (const Wa__DisappearingMode *message)
 {
-  assert(message->base.descriptor == &wa__disappearing_mode__descriptor);
+  assert(message->descriptor == &wa__disappearing_mode__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__disappearing_mode__pack
                      (const Wa__DisappearingMode *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__disappearing_mode__descriptor);
+  assert(message->descriptor == &wa__disappearing_mode__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__disappearing_mode__pack_to_buffer
                      (const Wa__DisappearingMode *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__disappearing_mode__descriptor);
+  assert(message->descriptor == &wa__disappearing_mode__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__DisappearingMode *
@@ -925,7 +925,7 @@ void   wa__disappearing_mode__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__disappearing_mode__descriptor);
+  assert(message->descriptor == &wa__disappearing_mode__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__ephemeral_setting__init
@@ -937,21 +937,21 @@ void   wa__ephemeral_setting__init
 size_t wa__ephemeral_setting__get_packed_size
                      (const Wa__EphemeralSetting *message)
 {
-  assert(message->base.descriptor == &wa__ephemeral_setting__descriptor);
+  assert(message->descriptor == &wa__ephemeral_setting__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__ephemeral_setting__pack
                      (const Wa__EphemeralSetting *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__ephemeral_setting__descriptor);
+  assert(message->descriptor == &wa__ephemeral_setting__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__ephemeral_setting__pack_to_buffer
                      (const Wa__EphemeralSetting *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__ephemeral_setting__descriptor);
+  assert(message->descriptor == &wa__ephemeral_setting__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__EphemeralSetting *
@@ -970,7 +970,7 @@ void   wa__ephemeral_setting__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__ephemeral_setting__descriptor);
+  assert(message->descriptor == &wa__ephemeral_setting__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__exit_code__init
@@ -982,21 +982,21 @@ void   wa__exit_code__init
 size_t wa__exit_code__get_packed_size
                      (const Wa__ExitCode *message)
 {
-  assert(message->base.descriptor == &wa__exit_code__descriptor);
+  assert(message->descriptor == &wa__exit_code__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__exit_code__pack
                      (const Wa__ExitCode *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__exit_code__descriptor);
+  assert(message->descriptor == &wa__exit_code__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__exit_code__pack_to_buffer
                      (const Wa__ExitCode *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__exit_code__descriptor);
+  assert(message->descriptor == &wa__exit_code__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ExitCode *
@@ -1015,7 +1015,7 @@ void   wa__exit_code__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__exit_code__descriptor);
+  assert(message->descriptor == &wa__exit_code__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__external_blob_reference__init
@@ -1027,21 +1027,21 @@ void   wa__external_blob_reference__init
 size_t wa__external_blob_reference__get_packed_size
                      (const Wa__ExternalBlobReference *message)
 {
-  assert(message->base.descriptor == &wa__external_blob_reference__descriptor);
+  assert(message->descriptor == &wa__external_blob_reference__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__external_blob_reference__pack
                      (const Wa__ExternalBlobReference *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__external_blob_reference__descriptor);
+  assert(message->descriptor == &wa__external_blob_reference__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__external_blob_reference__pack_to_buffer
                      (const Wa__ExternalBlobReference *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__external_blob_reference__descriptor);
+  assert(message->descriptor == &wa__external_blob_reference__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ExternalBlobReference *
@@ -1060,7 +1060,7 @@ void   wa__external_blob_reference__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__external_blob_reference__descriptor);
+  assert(message->descriptor == &wa__external_blob_reference__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__global_settings__init
@@ -1072,21 +1072,21 @@ void   wa__global_settings__init
 size_t wa__global_settings__get_packed_size
                      (const Wa__GlobalSettings *message)
 {
-  assert(message->base.descriptor == &wa__global_settings__descriptor);
+  assert(message->descriptor == &wa__global_settings__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__global_settings__pack
                      (const Wa__GlobalSettings *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__global_settings__descriptor);
+  assert(message->descriptor == &wa__global_settings__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__global_settings__pack_to_buffer
                      (const Wa__GlobalSettings *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__global_settings__descriptor);
+  assert(message->descriptor == &wa__global_settings__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__GlobalSettings *
@@ -1105,7 +1105,7 @@ void   wa__global_settings__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__global_settings__descriptor);
+  assert(message->descriptor == &wa__global_settings__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__group_participant__init
@@ -1117,21 +1117,21 @@ void   wa__group_participant__init
 size_t wa__group_participant__get_packed_size
                      (const Wa__GroupParticipant *message)
 {
-  assert(message->base.descriptor == &wa__group_participant__descriptor);
+  assert(message->descriptor == &wa__group_participant__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__group_participant__pack
                      (const Wa__GroupParticipant *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__group_participant__descriptor);
+  assert(message->descriptor == &wa__group_participant__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__group_participant__pack_to_buffer
                      (const Wa__GroupParticipant *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__group_participant__descriptor);
+  assert(message->descriptor == &wa__group_participant__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__GroupParticipant *
@@ -1150,7 +1150,7 @@ void   wa__group_participant__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__group_participant__descriptor);
+  assert(message->descriptor == &wa__group_participant__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__handshake_message__client_finish__init
@@ -1180,21 +1180,21 @@ void   wa__handshake_message__init
 size_t wa__handshake_message__get_packed_size
                      (const Wa__HandshakeMessage *message)
 {
-  assert(message->base.descriptor == &wa__handshake_message__descriptor);
+  assert(message->descriptor == &wa__handshake_message__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__handshake_message__pack
                      (const Wa__HandshakeMessage *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__handshake_message__descriptor);
+  assert(message->descriptor == &wa__handshake_message__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__handshake_message__pack_to_buffer
                      (const Wa__HandshakeMessage *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__handshake_message__descriptor);
+  assert(message->descriptor == &wa__handshake_message__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__HandshakeMessage *
@@ -1213,7 +1213,7 @@ void   wa__handshake_message__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__handshake_message__descriptor);
+  assert(message->descriptor == &wa__handshake_message__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__history_sync__init
@@ -1225,21 +1225,21 @@ void   wa__history_sync__init
 size_t wa__history_sync__get_packed_size
                      (const Wa__HistorySync *message)
 {
-  assert(message->base.descriptor == &wa__history_sync__descriptor);
+  assert(message->descriptor == &wa__history_sync__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__history_sync__pack
                      (const Wa__HistorySync *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__history_sync__descriptor);
+  assert(message->descriptor == &wa__history_sync__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__history_sync__pack_to_buffer
                      (const Wa__HistorySync *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__history_sync__descriptor);
+  assert(message->descriptor == &wa__history_sync__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__HistorySync *
@@ -1258,7 +1258,7 @@ void   wa__history_sync__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__history_sync__descriptor);
+  assert(message->descriptor == &wa__history_sync__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__history_sync_msg__init
@@ -1270,21 +1270,21 @@ void   wa__history_sync_msg__init
 size_t wa__history_sync_msg__get_packed_size
                      (const Wa__HistorySyncMsg *message)
 {
-  assert(message->base.descriptor == &wa__history_sync_msg__descriptor);
+  assert(message->descriptor == &wa__history_sync_msg__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__history_sync_msg__pack
                      (const Wa__HistorySyncMsg *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__history_sync_msg__descriptor);
+  assert(message->descriptor == &wa__history_sync_msg__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__history_sync_msg__pack_to_buffer
                      (const Wa__HistorySyncMsg *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__history_sync_msg__descriptor);
+  assert(message->descriptor == &wa__history_sync_msg__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__HistorySyncMsg *
@@ -1303,7 +1303,7 @@ void   wa__history_sync_msg__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__history_sync_msg__descriptor);
+  assert(message->descriptor == &wa__history_sync_msg__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__hydrated_template_button__hydrated_call_button__init
@@ -1333,21 +1333,21 @@ void   wa__hydrated_template_button__init
 size_t wa__hydrated_template_button__get_packed_size
                      (const Wa__HydratedTemplateButton *message)
 {
-  assert(message->base.descriptor == &wa__hydrated_template_button__descriptor);
+  assert(message->descriptor == &wa__hydrated_template_button__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__hydrated_template_button__pack
                      (const Wa__HydratedTemplateButton *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__hydrated_template_button__descriptor);
+  assert(message->descriptor == &wa__hydrated_template_button__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__hydrated_template_button__pack_to_buffer
                      (const Wa__HydratedTemplateButton *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__hydrated_template_button__descriptor);
+  assert(message->descriptor == &wa__hydrated_template_button__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__HydratedTemplateButton *
@@ -1366,7 +1366,7 @@ void   wa__hydrated_template_button__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__hydrated_template_button__descriptor);
+  assert(message->descriptor == &wa__hydrated_template_button__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__identity_key_pair_structure__init
@@ -1378,21 +1378,21 @@ void   wa__identity_key_pair_structure__init
 size_t wa__identity_key_pair_structure__get_packed_size
                      (const Wa__IdentityKeyPairStructure *message)
 {
-  assert(message->base.descriptor == &wa__identity_key_pair_structure__descriptor);
+  assert(message->descriptor == &wa__identity_key_pair_structure__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__identity_key_pair_structure__pack
                      (const Wa__IdentityKeyPairStructure *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__identity_key_pair_structure__descriptor);
+  assert(message->descriptor == &wa__identity_key_pair_structure__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__identity_key_pair_structure__pack_to_buffer
                      (const Wa__IdentityKeyPairStructure *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__identity_key_pair_structure__descriptor);
+  assert(message->descriptor == &wa__identity_key_pair_structure__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__IdentityKeyPairStructure *
@@ -1411,7 +1411,7 @@ void   wa__identity_key_pair_structure__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__identity_key_pair_structure__descriptor);
+  assert(message->descriptor == &wa__identity_key_pair_structure__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__interactive_annotation__init
@@ -1423,21 +1423,21 @@ void   wa__interactive_annotation__init
 size_t wa__interactive_annotation__get_packed_size
                      (const Wa__InteractiveAnnotation *message)
 {
-  assert(message->base.descriptor == &wa__interactive_annotation__descriptor);
+  assert(message->descriptor == &wa__interactive_annotation__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__interactive_annotation__pack
                      (const Wa__InteractiveAnnotation *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__interactive_annotation__descriptor);
+  assert(message->descriptor == &wa__interactive_annotation__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__interactive_annotation__pack_to_buffer
                      (const Wa__InteractiveAnnotation *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__interactive_annotation__descriptor);
+  assert(message->descriptor == &wa__interactive_annotation__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__InteractiveAnnotation *
@@ -1456,7 +1456,7 @@ void   wa__interactive_annotation__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__interactive_annotation__descriptor);
+  assert(message->descriptor == &wa__interactive_annotation__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__keep_in_chat__init
@@ -1468,21 +1468,21 @@ void   wa__keep_in_chat__init
 size_t wa__keep_in_chat__get_packed_size
                      (const Wa__KeepInChat *message)
 {
-  assert(message->base.descriptor == &wa__keep_in_chat__descriptor);
+  assert(message->descriptor == &wa__keep_in_chat__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__keep_in_chat__pack
                      (const Wa__KeepInChat *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__keep_in_chat__descriptor);
+  assert(message->descriptor == &wa__keep_in_chat__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__keep_in_chat__pack_to_buffer
                      (const Wa__KeepInChat *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__keep_in_chat__descriptor);
+  assert(message->descriptor == &wa__keep_in_chat__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__KeepInChat *
@@ -1501,7 +1501,7 @@ void   wa__keep_in_chat__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__keep_in_chat__descriptor);
+  assert(message->descriptor == &wa__keep_in_chat__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__key_id__init
@@ -1513,21 +1513,21 @@ void   wa__key_id__init
 size_t wa__key_id__get_packed_size
                      (const Wa__KeyId *message)
 {
-  assert(message->base.descriptor == &wa__key_id__descriptor);
+  assert(message->descriptor == &wa__key_id__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__key_id__pack
                      (const Wa__KeyId *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__key_id__descriptor);
+  assert(message->descriptor == &wa__key_id__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__key_id__pack_to_buffer
                      (const Wa__KeyId *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__key_id__descriptor);
+  assert(message->descriptor == &wa__key_id__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__KeyId *
@@ -1546,7 +1546,7 @@ void   wa__key_id__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__key_id__descriptor);
+  assert(message->descriptor == &wa__key_id__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__localized_name__init
@@ -1558,21 +1558,21 @@ void   wa__localized_name__init
 size_t wa__localized_name__get_packed_size
                      (const Wa__LocalizedName *message)
 {
-  assert(message->base.descriptor == &wa__localized_name__descriptor);
+  assert(message->descriptor == &wa__localized_name__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__localized_name__pack
                      (const Wa__LocalizedName *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__localized_name__descriptor);
+  assert(message->descriptor == &wa__localized_name__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__localized_name__pack_to_buffer
                      (const Wa__LocalizedName *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__localized_name__descriptor);
+  assert(message->descriptor == &wa__localized_name__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__LocalizedName *
@@ -1591,7 +1591,7 @@ void   wa__localized_name__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__localized_name__descriptor);
+  assert(message->descriptor == &wa__localized_name__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__location__init
@@ -1603,21 +1603,21 @@ void   wa__location__init
 size_t wa__location__get_packed_size
                      (const Wa__Location *message)
 {
-  assert(message->base.descriptor == &wa__location__descriptor);
+  assert(message->descriptor == &wa__location__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__location__pack
                      (const Wa__Location *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__location__descriptor);
+  assert(message->descriptor == &wa__location__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__location__pack_to_buffer
                      (const Wa__Location *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__location__descriptor);
+  assert(message->descriptor == &wa__location__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__Location *
@@ -1636,7 +1636,7 @@ void   wa__location__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__location__descriptor);
+  assert(message->descriptor == &wa__location__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__media_data__init
@@ -1648,21 +1648,21 @@ void   wa__media_data__init
 size_t wa__media_data__get_packed_size
                      (const Wa__MediaData *message)
 {
-  assert(message->base.descriptor == &wa__media_data__descriptor);
+  assert(message->descriptor == &wa__media_data__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__media_data__pack
                      (const Wa__MediaData *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__media_data__descriptor);
+  assert(message->descriptor == &wa__media_data__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__media_data__pack_to_buffer
                      (const Wa__MediaData *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__media_data__descriptor);
+  assert(message->descriptor == &wa__media_data__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__MediaData *
@@ -1681,7 +1681,7 @@ void   wa__media_data__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__media_data__descriptor);
+  assert(message->descriptor == &wa__media_data__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__media_retry_notification__init
@@ -1693,21 +1693,21 @@ void   wa__media_retry_notification__init
 size_t wa__media_retry_notification__get_packed_size
                      (const Wa__MediaRetryNotification *message)
 {
-  assert(message->base.descriptor == &wa__media_retry_notification__descriptor);
+  assert(message->descriptor == &wa__media_retry_notification__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__media_retry_notification__pack
                      (const Wa__MediaRetryNotification *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__media_retry_notification__descriptor);
+  assert(message->descriptor == &wa__media_retry_notification__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__media_retry_notification__pack_to_buffer
                      (const Wa__MediaRetryNotification *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__media_retry_notification__descriptor);
+  assert(message->descriptor == &wa__media_retry_notification__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__MediaRetryNotification *
@@ -1726,7 +1726,7 @@ void   wa__media_retry_notification__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__media_retry_notification__descriptor);
+  assert(message->descriptor == &wa__media_retry_notification__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__message__app_state_fatal_exception_notification__init
@@ -2242,21 +2242,21 @@ void   wa__message__init
 size_t wa__message__get_packed_size
                      (const Wa__Message *message)
 {
-  assert(message->base.descriptor == &wa__message__descriptor);
+  assert(message->descriptor == &wa__message__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__message__pack
                      (const Wa__Message *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__message__descriptor);
+  assert(message->descriptor == &wa__message__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__message__pack_to_buffer
                      (const Wa__Message *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__message__descriptor);
+  assert(message->descriptor == &wa__message__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__Message *
@@ -2275,7 +2275,7 @@ void   wa__message__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__message__descriptor);
+  assert(message->descriptor == &wa__message__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__message_context_info__init
@@ -2287,21 +2287,21 @@ void   wa__message_context_info__init
 size_t wa__message_context_info__get_packed_size
                      (const Wa__MessageContextInfo *message)
 {
-  assert(message->base.descriptor == &wa__message_context_info__descriptor);
+  assert(message->descriptor == &wa__message_context_info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__message_context_info__pack
                      (const Wa__MessageContextInfo *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__message_context_info__descriptor);
+  assert(message->descriptor == &wa__message_context_info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__message_context_info__pack_to_buffer
                      (const Wa__MessageContextInfo *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__message_context_info__descriptor);
+  assert(message->descriptor == &wa__message_context_info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__MessageContextInfo *
@@ -2320,7 +2320,7 @@ void   wa__message_context_info__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__message_context_info__descriptor);
+  assert(message->descriptor == &wa__message_context_info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__message_key__init
@@ -2332,21 +2332,21 @@ void   wa__message_key__init
 size_t wa__message_key__get_packed_size
                      (const Wa__MessageKey *message)
 {
-  assert(message->base.descriptor == &wa__message_key__descriptor);
+  assert(message->descriptor == &wa__message_key__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__message_key__pack
                      (const Wa__MessageKey *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__message_key__descriptor);
+  assert(message->descriptor == &wa__message_key__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__message_key__pack_to_buffer
                      (const Wa__MessageKey *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__message_key__descriptor);
+  assert(message->descriptor == &wa__message_key__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__MessageKey *
@@ -2365,7 +2365,7 @@ void   wa__message_key__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__message_key__descriptor);
+  assert(message->descriptor == &wa__message_key__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__money__init
@@ -2377,21 +2377,21 @@ void   wa__money__init
 size_t wa__money__get_packed_size
                      (const Wa__Money *message)
 {
-  assert(message->base.descriptor == &wa__money__descriptor);
+  assert(message->descriptor == &wa__money__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__money__pack
                      (const Wa__Money *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__money__descriptor);
+  assert(message->descriptor == &wa__money__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__money__pack_to_buffer
                      (const Wa__Money *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__money__descriptor);
+  assert(message->descriptor == &wa__money__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__Money *
@@ -2410,7 +2410,7 @@ void   wa__money__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__money__descriptor);
+  assert(message->descriptor == &wa__money__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__msg_opaque_data__poll_option__init
@@ -2428,21 +2428,21 @@ void   wa__msg_opaque_data__init
 size_t wa__msg_opaque_data__get_packed_size
                      (const Wa__MsgOpaqueData *message)
 {
-  assert(message->base.descriptor == &wa__msg_opaque_data__descriptor);
+  assert(message->descriptor == &wa__msg_opaque_data__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__msg_opaque_data__pack
                      (const Wa__MsgOpaqueData *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__msg_opaque_data__descriptor);
+  assert(message->descriptor == &wa__msg_opaque_data__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__msg_opaque_data__pack_to_buffer
                      (const Wa__MsgOpaqueData *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__msg_opaque_data__descriptor);
+  assert(message->descriptor == &wa__msg_opaque_data__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__MsgOpaqueData *
@@ -2461,7 +2461,7 @@ void   wa__msg_opaque_data__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__msg_opaque_data__descriptor);
+  assert(message->descriptor == &wa__msg_opaque_data__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__msg_row_opaque_data__init
@@ -2473,21 +2473,21 @@ void   wa__msg_row_opaque_data__init
 size_t wa__msg_row_opaque_data__get_packed_size
                      (const Wa__MsgRowOpaqueData *message)
 {
-  assert(message->base.descriptor == &wa__msg_row_opaque_data__descriptor);
+  assert(message->descriptor == &wa__msg_row_opaque_data__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__msg_row_opaque_data__pack
                      (const Wa__MsgRowOpaqueData *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__msg_row_opaque_data__descriptor);
+  assert(message->descriptor == &wa__msg_row_opaque_data__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__msg_row_opaque_data__pack_to_buffer
                      (const Wa__MsgRowOpaqueData *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__msg_row_opaque_data__descriptor);
+  assert(message->descriptor == &wa__msg_row_opaque_data__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__MsgRowOpaqueData *
@@ -2506,7 +2506,7 @@ void   wa__msg_row_opaque_data__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__msg_row_opaque_data__descriptor);
+  assert(message->descriptor == &wa__msg_row_opaque_data__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__noise_certificate__details__init
@@ -2524,21 +2524,21 @@ void   wa__noise_certificate__init
 size_t wa__noise_certificate__get_packed_size
                      (const Wa__NoiseCertificate *message)
 {
-  assert(message->base.descriptor == &wa__noise_certificate__descriptor);
+  assert(message->descriptor == &wa__noise_certificate__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__noise_certificate__pack
                      (const Wa__NoiseCertificate *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__noise_certificate__descriptor);
+  assert(message->descriptor == &wa__noise_certificate__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__noise_certificate__pack_to_buffer
                      (const Wa__NoiseCertificate *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__noise_certificate__descriptor);
+  assert(message->descriptor == &wa__noise_certificate__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__NoiseCertificate *
@@ -2557,7 +2557,7 @@ void   wa__noise_certificate__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__noise_certificate__descriptor);
+  assert(message->descriptor == &wa__noise_certificate__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__notification_message_info__init
@@ -2569,21 +2569,21 @@ void   wa__notification_message_info__init
 size_t wa__notification_message_info__get_packed_size
                      (const Wa__NotificationMessageInfo *message)
 {
-  assert(message->base.descriptor == &wa__notification_message_info__descriptor);
+  assert(message->descriptor == &wa__notification_message_info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__notification_message_info__pack
                      (const Wa__NotificationMessageInfo *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__notification_message_info__descriptor);
+  assert(message->descriptor == &wa__notification_message_info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__notification_message_info__pack_to_buffer
                      (const Wa__NotificationMessageInfo *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__notification_message_info__descriptor);
+  assert(message->descriptor == &wa__notification_message_info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__NotificationMessageInfo *
@@ -2602,7 +2602,7 @@ void   wa__notification_message_info__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__notification_message_info__descriptor);
+  assert(message->descriptor == &wa__notification_message_info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__past_participant__init
@@ -2614,21 +2614,21 @@ void   wa__past_participant__init
 size_t wa__past_participant__get_packed_size
                      (const Wa__PastParticipant *message)
 {
-  assert(message->base.descriptor == &wa__past_participant__descriptor);
+  assert(message->descriptor == &wa__past_participant__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__past_participant__pack
                      (const Wa__PastParticipant *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__past_participant__descriptor);
+  assert(message->descriptor == &wa__past_participant__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__past_participant__pack_to_buffer
                      (const Wa__PastParticipant *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__past_participant__descriptor);
+  assert(message->descriptor == &wa__past_participant__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PastParticipant *
@@ -2647,7 +2647,7 @@ void   wa__past_participant__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__past_participant__descriptor);
+  assert(message->descriptor == &wa__past_participant__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__past_participants__init
@@ -2659,21 +2659,21 @@ void   wa__past_participants__init
 size_t wa__past_participants__get_packed_size
                      (const Wa__PastParticipants *message)
 {
-  assert(message->base.descriptor == &wa__past_participants__descriptor);
+  assert(message->descriptor == &wa__past_participants__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__past_participants__pack
                      (const Wa__PastParticipants *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__past_participants__descriptor);
+  assert(message->descriptor == &wa__past_participants__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__past_participants__pack_to_buffer
                      (const Wa__PastParticipants *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__past_participants__descriptor);
+  assert(message->descriptor == &wa__past_participants__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PastParticipants *
@@ -2692,7 +2692,7 @@ void   wa__past_participants__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__past_participants__descriptor);
+  assert(message->descriptor == &wa__past_participants__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__payment_background__media_data__init
@@ -2710,21 +2710,21 @@ void   wa__payment_background__init
 size_t wa__payment_background__get_packed_size
                      (const Wa__PaymentBackground *message)
 {
-  assert(message->base.descriptor == &wa__payment_background__descriptor);
+  assert(message->descriptor == &wa__payment_background__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__payment_background__pack
                      (const Wa__PaymentBackground *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__payment_background__descriptor);
+  assert(message->descriptor == &wa__payment_background__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__payment_background__pack_to_buffer
                      (const Wa__PaymentBackground *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__payment_background__descriptor);
+  assert(message->descriptor == &wa__payment_background__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PaymentBackground *
@@ -2743,7 +2743,7 @@ void   wa__payment_background__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__payment_background__descriptor);
+  assert(message->descriptor == &wa__payment_background__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__payment_info__init
@@ -2755,21 +2755,21 @@ void   wa__payment_info__init
 size_t wa__payment_info__get_packed_size
                      (const Wa__PaymentInfo *message)
 {
-  assert(message->base.descriptor == &wa__payment_info__descriptor);
+  assert(message->descriptor == &wa__payment_info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__payment_info__pack
                      (const Wa__PaymentInfo *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__payment_info__descriptor);
+  assert(message->descriptor == &wa__payment_info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__payment_info__pack_to_buffer
                      (const Wa__PaymentInfo *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__payment_info__descriptor);
+  assert(message->descriptor == &wa__payment_info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PaymentInfo *
@@ -2788,7 +2788,7 @@ void   wa__payment_info__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__payment_info__descriptor);
+  assert(message->descriptor == &wa__payment_info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__pending_key_exchange__init
@@ -2800,21 +2800,21 @@ void   wa__pending_key_exchange__init
 size_t wa__pending_key_exchange__get_packed_size
                      (const Wa__PendingKeyExchange *message)
 {
-  assert(message->base.descriptor == &wa__pending_key_exchange__descriptor);
+  assert(message->descriptor == &wa__pending_key_exchange__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__pending_key_exchange__pack
                      (const Wa__PendingKeyExchange *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__pending_key_exchange__descriptor);
+  assert(message->descriptor == &wa__pending_key_exchange__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__pending_key_exchange__pack_to_buffer
                      (const Wa__PendingKeyExchange *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__pending_key_exchange__descriptor);
+  assert(message->descriptor == &wa__pending_key_exchange__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PendingKeyExchange *
@@ -2833,7 +2833,7 @@ void   wa__pending_key_exchange__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__pending_key_exchange__descriptor);
+  assert(message->descriptor == &wa__pending_key_exchange__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__pending_pre_key__init
@@ -2845,21 +2845,21 @@ void   wa__pending_pre_key__init
 size_t wa__pending_pre_key__get_packed_size
                      (const Wa__PendingPreKey *message)
 {
-  assert(message->base.descriptor == &wa__pending_pre_key__descriptor);
+  assert(message->descriptor == &wa__pending_pre_key__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__pending_pre_key__pack
                      (const Wa__PendingPreKey *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__pending_pre_key__descriptor);
+  assert(message->descriptor == &wa__pending_pre_key__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__pending_pre_key__pack_to_buffer
                      (const Wa__PendingPreKey *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__pending_pre_key__descriptor);
+  assert(message->descriptor == &wa__pending_pre_key__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PendingPreKey *
@@ -2878,7 +2878,7 @@ void   wa__pending_pre_key__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__pending_pre_key__descriptor);
+  assert(message->descriptor == &wa__pending_pre_key__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__photo_change__init
@@ -2890,21 +2890,21 @@ void   wa__photo_change__init
 size_t wa__photo_change__get_packed_size
                      (const Wa__PhotoChange *message)
 {
-  assert(message->base.descriptor == &wa__photo_change__descriptor);
+  assert(message->descriptor == &wa__photo_change__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__photo_change__pack
                      (const Wa__PhotoChange *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__photo_change__descriptor);
+  assert(message->descriptor == &wa__photo_change__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__photo_change__pack_to_buffer
                      (const Wa__PhotoChange *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__photo_change__descriptor);
+  assert(message->descriptor == &wa__photo_change__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PhotoChange *
@@ -2923,7 +2923,7 @@ void   wa__photo_change__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__photo_change__descriptor);
+  assert(message->descriptor == &wa__photo_change__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__point__init
@@ -2935,21 +2935,21 @@ void   wa__point__init
 size_t wa__point__get_packed_size
                      (const Wa__Point *message)
 {
-  assert(message->base.descriptor == &wa__point__descriptor);
+  assert(message->descriptor == &wa__point__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__point__pack
                      (const Wa__Point *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__point__descriptor);
+  assert(message->descriptor == &wa__point__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__point__pack_to_buffer
                      (const Wa__Point *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__point__descriptor);
+  assert(message->descriptor == &wa__point__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__Point *
@@ -2968,7 +2968,7 @@ void   wa__point__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__point__descriptor);
+  assert(message->descriptor == &wa__point__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__poll_additional_metadata__init
@@ -2980,21 +2980,21 @@ void   wa__poll_additional_metadata__init
 size_t wa__poll_additional_metadata__get_packed_size
                      (const Wa__PollAdditionalMetadata *message)
 {
-  assert(message->base.descriptor == &wa__poll_additional_metadata__descriptor);
+  assert(message->descriptor == &wa__poll_additional_metadata__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__poll_additional_metadata__pack
                      (const Wa__PollAdditionalMetadata *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__poll_additional_metadata__descriptor);
+  assert(message->descriptor == &wa__poll_additional_metadata__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__poll_additional_metadata__pack_to_buffer
                      (const Wa__PollAdditionalMetadata *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__poll_additional_metadata__descriptor);
+  assert(message->descriptor == &wa__poll_additional_metadata__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PollAdditionalMetadata *
@@ -3013,7 +3013,7 @@ void   wa__poll_additional_metadata__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__poll_additional_metadata__descriptor);
+  assert(message->descriptor == &wa__poll_additional_metadata__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__poll_enc_value__init
@@ -3025,21 +3025,21 @@ void   wa__poll_enc_value__init
 size_t wa__poll_enc_value__get_packed_size
                      (const Wa__PollEncValue *message)
 {
-  assert(message->base.descriptor == &wa__poll_enc_value__descriptor);
+  assert(message->descriptor == &wa__poll_enc_value__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__poll_enc_value__pack
                      (const Wa__PollEncValue *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__poll_enc_value__descriptor);
+  assert(message->descriptor == &wa__poll_enc_value__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__poll_enc_value__pack_to_buffer
                      (const Wa__PollEncValue *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__poll_enc_value__descriptor);
+  assert(message->descriptor == &wa__poll_enc_value__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PollEncValue *
@@ -3058,7 +3058,7 @@ void   wa__poll_enc_value__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__poll_enc_value__descriptor);
+  assert(message->descriptor == &wa__poll_enc_value__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__poll_update__init
@@ -3070,21 +3070,21 @@ void   wa__poll_update__init
 size_t wa__poll_update__get_packed_size
                      (const Wa__PollUpdate *message)
 {
-  assert(message->base.descriptor == &wa__poll_update__descriptor);
+  assert(message->descriptor == &wa__poll_update__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__poll_update__pack
                      (const Wa__PollUpdate *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__poll_update__descriptor);
+  assert(message->descriptor == &wa__poll_update__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__poll_update__pack_to_buffer
                      (const Wa__PollUpdate *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__poll_update__descriptor);
+  assert(message->descriptor == &wa__poll_update__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PollUpdate *
@@ -3103,7 +3103,7 @@ void   wa__poll_update__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__poll_update__descriptor);
+  assert(message->descriptor == &wa__poll_update__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__pre_key_record_structure__init
@@ -3115,21 +3115,21 @@ void   wa__pre_key_record_structure__init
 size_t wa__pre_key_record_structure__get_packed_size
                      (const Wa__PreKeyRecordStructure *message)
 {
-  assert(message->base.descriptor == &wa__pre_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__pre_key_record_structure__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__pre_key_record_structure__pack
                      (const Wa__PreKeyRecordStructure *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__pre_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__pre_key_record_structure__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__pre_key_record_structure__pack_to_buffer
                      (const Wa__PreKeyRecordStructure *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__pre_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__pre_key_record_structure__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__PreKeyRecordStructure *
@@ -3148,7 +3148,7 @@ void   wa__pre_key_record_structure__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__pre_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__pre_key_record_structure__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__pushname__init
@@ -3160,21 +3160,21 @@ void   wa__pushname__init
 size_t wa__pushname__get_packed_size
                      (const Wa__Pushname *message)
 {
-  assert(message->base.descriptor == &wa__pushname__descriptor);
+  assert(message->descriptor == &wa__pushname__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__pushname__pack
                      (const Wa__Pushname *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__pushname__descriptor);
+  assert(message->descriptor == &wa__pushname__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__pushname__pack_to_buffer
                      (const Wa__Pushname *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__pushname__descriptor);
+  assert(message->descriptor == &wa__pushname__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__Pushname *
@@ -3193,7 +3193,7 @@ void   wa__pushname__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__pushname__descriptor);
+  assert(message->descriptor == &wa__pushname__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__reaction__init
@@ -3205,21 +3205,21 @@ void   wa__reaction__init
 size_t wa__reaction__get_packed_size
                      (const Wa__Reaction *message)
 {
-  assert(message->base.descriptor == &wa__reaction__descriptor);
+  assert(message->descriptor == &wa__reaction__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__reaction__pack
                      (const Wa__Reaction *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__reaction__descriptor);
+  assert(message->descriptor == &wa__reaction__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__reaction__pack_to_buffer
                      (const Wa__Reaction *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__reaction__descriptor);
+  assert(message->descriptor == &wa__reaction__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__Reaction *
@@ -3238,7 +3238,7 @@ void   wa__reaction__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__reaction__descriptor);
+  assert(message->descriptor == &wa__reaction__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__recent_emoji_weight__init
@@ -3250,21 +3250,21 @@ void   wa__recent_emoji_weight__init
 size_t wa__recent_emoji_weight__get_packed_size
                      (const Wa__RecentEmojiWeight *message)
 {
-  assert(message->base.descriptor == &wa__recent_emoji_weight__descriptor);
+  assert(message->descriptor == &wa__recent_emoji_weight__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__recent_emoji_weight__pack
                      (const Wa__RecentEmojiWeight *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__recent_emoji_weight__descriptor);
+  assert(message->descriptor == &wa__recent_emoji_weight__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__recent_emoji_weight__pack_to_buffer
                      (const Wa__RecentEmojiWeight *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__recent_emoji_weight__descriptor);
+  assert(message->descriptor == &wa__recent_emoji_weight__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__RecentEmojiWeight *
@@ -3283,7 +3283,7 @@ void   wa__recent_emoji_weight__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__recent_emoji_weight__descriptor);
+  assert(message->descriptor == &wa__recent_emoji_weight__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__record_structure__init
@@ -3295,21 +3295,21 @@ void   wa__record_structure__init
 size_t wa__record_structure__get_packed_size
                      (const Wa__RecordStructure *message)
 {
-  assert(message->base.descriptor == &wa__record_structure__descriptor);
+  assert(message->descriptor == &wa__record_structure__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__record_structure__pack
                      (const Wa__RecordStructure *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__record_structure__descriptor);
+  assert(message->descriptor == &wa__record_structure__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__record_structure__pack_to_buffer
                      (const Wa__RecordStructure *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__record_structure__descriptor);
+  assert(message->descriptor == &wa__record_structure__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__RecordStructure *
@@ -3328,7 +3328,7 @@ void   wa__record_structure__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__record_structure__descriptor);
+  assert(message->descriptor == &wa__record_structure__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__sender_chain_key__init
@@ -3340,21 +3340,21 @@ void   wa__sender_chain_key__init
 size_t wa__sender_chain_key__get_packed_size
                      (const Wa__SenderChainKey *message)
 {
-  assert(message->base.descriptor == &wa__sender_chain_key__descriptor);
+  assert(message->descriptor == &wa__sender_chain_key__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__sender_chain_key__pack
                      (const Wa__SenderChainKey *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__sender_chain_key__descriptor);
+  assert(message->descriptor == &wa__sender_chain_key__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__sender_chain_key__pack_to_buffer
                      (const Wa__SenderChainKey *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__sender_chain_key__descriptor);
+  assert(message->descriptor == &wa__sender_chain_key__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SenderChainKey *
@@ -3373,7 +3373,7 @@ void   wa__sender_chain_key__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__sender_chain_key__descriptor);
+  assert(message->descriptor == &wa__sender_chain_key__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__sender_key_record_structure__init
@@ -3385,21 +3385,21 @@ void   wa__sender_key_record_structure__init
 size_t wa__sender_key_record_structure__get_packed_size
                      (const Wa__SenderKeyRecordStructure *message)
 {
-  assert(message->base.descriptor == &wa__sender_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__sender_key_record_structure__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__sender_key_record_structure__pack
                      (const Wa__SenderKeyRecordStructure *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__sender_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__sender_key_record_structure__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__sender_key_record_structure__pack_to_buffer
                      (const Wa__SenderKeyRecordStructure *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__sender_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__sender_key_record_structure__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SenderKeyRecordStructure *
@@ -3418,7 +3418,7 @@ void   wa__sender_key_record_structure__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__sender_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__sender_key_record_structure__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__sender_key_state_structure__init
@@ -3430,21 +3430,21 @@ void   wa__sender_key_state_structure__init
 size_t wa__sender_key_state_structure__get_packed_size
                      (const Wa__SenderKeyStateStructure *message)
 {
-  assert(message->base.descriptor == &wa__sender_key_state_structure__descriptor);
+  assert(message->descriptor == &wa__sender_key_state_structure__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__sender_key_state_structure__pack
                      (const Wa__SenderKeyStateStructure *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__sender_key_state_structure__descriptor);
+  assert(message->descriptor == &wa__sender_key_state_structure__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__sender_key_state_structure__pack_to_buffer
                      (const Wa__SenderKeyStateStructure *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__sender_key_state_structure__descriptor);
+  assert(message->descriptor == &wa__sender_key_state_structure__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SenderKeyStateStructure *
@@ -3463,7 +3463,7 @@ void   wa__sender_key_state_structure__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__sender_key_state_structure__descriptor);
+  assert(message->descriptor == &wa__sender_key_state_structure__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__sender_message_key__init
@@ -3475,21 +3475,21 @@ void   wa__sender_message_key__init
 size_t wa__sender_message_key__get_packed_size
                      (const Wa__SenderMessageKey *message)
 {
-  assert(message->base.descriptor == &wa__sender_message_key__descriptor);
+  assert(message->descriptor == &wa__sender_message_key__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__sender_message_key__pack
                      (const Wa__SenderMessageKey *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__sender_message_key__descriptor);
+  assert(message->descriptor == &wa__sender_message_key__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__sender_message_key__pack_to_buffer
                      (const Wa__SenderMessageKey *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__sender_message_key__descriptor);
+  assert(message->descriptor == &wa__sender_message_key__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SenderMessageKey *
@@ -3508,7 +3508,7 @@ void   wa__sender_message_key__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__sender_message_key__descriptor);
+  assert(message->descriptor == &wa__sender_message_key__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__sender_signing_key__init
@@ -3520,21 +3520,21 @@ void   wa__sender_signing_key__init
 size_t wa__sender_signing_key__get_packed_size
                      (const Wa__SenderSigningKey *message)
 {
-  assert(message->base.descriptor == &wa__sender_signing_key__descriptor);
+  assert(message->descriptor == &wa__sender_signing_key__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__sender_signing_key__pack
                      (const Wa__SenderSigningKey *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__sender_signing_key__descriptor);
+  assert(message->descriptor == &wa__sender_signing_key__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__sender_signing_key__pack_to_buffer
                      (const Wa__SenderSigningKey *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__sender_signing_key__descriptor);
+  assert(message->descriptor == &wa__sender_signing_key__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SenderSigningKey *
@@ -3553,7 +3553,7 @@ void   wa__sender_signing_key__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__sender_signing_key__descriptor);
+  assert(message->descriptor == &wa__sender_signing_key__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__server_error_receipt__init
@@ -3565,21 +3565,21 @@ void   wa__server_error_receipt__init
 size_t wa__server_error_receipt__get_packed_size
                      (const Wa__ServerErrorReceipt *message)
 {
-  assert(message->base.descriptor == &wa__server_error_receipt__descriptor);
+  assert(message->descriptor == &wa__server_error_receipt__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__server_error_receipt__pack
                      (const Wa__ServerErrorReceipt *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__server_error_receipt__descriptor);
+  assert(message->descriptor == &wa__server_error_receipt__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__server_error_receipt__pack_to_buffer
                      (const Wa__ServerErrorReceipt *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__server_error_receipt__descriptor);
+  assert(message->descriptor == &wa__server_error_receipt__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__ServerErrorReceipt *
@@ -3598,7 +3598,7 @@ void   wa__server_error_receipt__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__server_error_receipt__descriptor);
+  assert(message->descriptor == &wa__server_error_receipt__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__session_structure__init
@@ -3610,21 +3610,21 @@ void   wa__session_structure__init
 size_t wa__session_structure__get_packed_size
                      (const Wa__SessionStructure *message)
 {
-  assert(message->base.descriptor == &wa__session_structure__descriptor);
+  assert(message->descriptor == &wa__session_structure__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__session_structure__pack
                      (const Wa__SessionStructure *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__session_structure__descriptor);
+  assert(message->descriptor == &wa__session_structure__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__session_structure__pack_to_buffer
                      (const Wa__SessionStructure *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__session_structure__descriptor);
+  assert(message->descriptor == &wa__session_structure__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SessionStructure *
@@ -3643,7 +3643,7 @@ void   wa__session_structure__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__session_structure__descriptor);
+  assert(message->descriptor == &wa__session_structure__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__signed_pre_key_record_structure__init
@@ -3655,21 +3655,21 @@ void   wa__signed_pre_key_record_structure__init
 size_t wa__signed_pre_key_record_structure__get_packed_size
                      (const Wa__SignedPreKeyRecordStructure *message)
 {
-  assert(message->base.descriptor == &wa__signed_pre_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__signed_pre_key_record_structure__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__signed_pre_key_record_structure__pack
                      (const Wa__SignedPreKeyRecordStructure *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__signed_pre_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__signed_pre_key_record_structure__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__signed_pre_key_record_structure__pack_to_buffer
                      (const Wa__SignedPreKeyRecordStructure *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__signed_pre_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__signed_pre_key_record_structure__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SignedPreKeyRecordStructure *
@@ -3688,7 +3688,7 @@ void   wa__signed_pre_key_record_structure__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__signed_pre_key_record_structure__descriptor);
+  assert(message->descriptor == &wa__signed_pre_key_record_structure__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__status_psa__init
@@ -3700,21 +3700,21 @@ void   wa__status_psa__init
 size_t wa__status_psa__get_packed_size
                      (const Wa__StatusPSA *message)
 {
-  assert(message->base.descriptor == &wa__status_psa__descriptor);
+  assert(message->descriptor == &wa__status_psa__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__status_psa__pack
                      (const Wa__StatusPSA *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__status_psa__descriptor);
+  assert(message->descriptor == &wa__status_psa__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__status_psa__pack_to_buffer
                      (const Wa__StatusPSA *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__status_psa__descriptor);
+  assert(message->descriptor == &wa__status_psa__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__StatusPSA *
@@ -3733,7 +3733,7 @@ void   wa__status_psa__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__status_psa__descriptor);
+  assert(message->descriptor == &wa__status_psa__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__sticker_metadata__init
@@ -3745,21 +3745,21 @@ void   wa__sticker_metadata__init
 size_t wa__sticker_metadata__get_packed_size
                      (const Wa__StickerMetadata *message)
 {
-  assert(message->base.descriptor == &wa__sticker_metadata__descriptor);
+  assert(message->descriptor == &wa__sticker_metadata__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__sticker_metadata__pack
                      (const Wa__StickerMetadata *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__sticker_metadata__descriptor);
+  assert(message->descriptor == &wa__sticker_metadata__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__sticker_metadata__pack_to_buffer
                      (const Wa__StickerMetadata *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__sticker_metadata__descriptor);
+  assert(message->descriptor == &wa__sticker_metadata__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__StickerMetadata *
@@ -3778,7 +3778,7 @@ void   wa__sticker_metadata__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__sticker_metadata__descriptor);
+  assert(message->descriptor == &wa__sticker_metadata__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__sync_action_data__init
@@ -3790,21 +3790,21 @@ void   wa__sync_action_data__init
 size_t wa__sync_action_data__get_packed_size
                      (const Wa__SyncActionData *message)
 {
-  assert(message->base.descriptor == &wa__sync_action_data__descriptor);
+  assert(message->descriptor == &wa__sync_action_data__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__sync_action_data__pack
                      (const Wa__SyncActionData *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__sync_action_data__descriptor);
+  assert(message->descriptor == &wa__sync_action_data__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__sync_action_data__pack_to_buffer
                      (const Wa__SyncActionData *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__sync_action_data__descriptor);
+  assert(message->descriptor == &wa__sync_action_data__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncActionData *
@@ -3823,7 +3823,7 @@ void   wa__sync_action_data__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__sync_action_data__descriptor);
+  assert(message->descriptor == &wa__sync_action_data__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__sync_action_value__agent_action__init
@@ -4009,21 +4009,21 @@ void   wa__sync_action_value__init
 size_t wa__sync_action_value__get_packed_size
                      (const Wa__SyncActionValue *message)
 {
-  assert(message->base.descriptor == &wa__sync_action_value__descriptor);
+  assert(message->descriptor == &wa__sync_action_value__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__sync_action_value__pack
                      (const Wa__SyncActionValue *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__sync_action_value__descriptor);
+  assert(message->descriptor == &wa__sync_action_value__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__sync_action_value__pack_to_buffer
                      (const Wa__SyncActionValue *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__sync_action_value__descriptor);
+  assert(message->descriptor == &wa__sync_action_value__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncActionValue *
@@ -4042,7 +4042,7 @@ void   wa__sync_action_value__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__sync_action_value__descriptor);
+  assert(message->descriptor == &wa__sync_action_value__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__syncd_index__init
@@ -4054,21 +4054,21 @@ void   wa__syncd_index__init
 size_t wa__syncd_index__get_packed_size
                      (const Wa__SyncdIndex *message)
 {
-  assert(message->base.descriptor == &wa__syncd_index__descriptor);
+  assert(message->descriptor == &wa__syncd_index__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__syncd_index__pack
                      (const Wa__SyncdIndex *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__syncd_index__descriptor);
+  assert(message->descriptor == &wa__syncd_index__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__syncd_index__pack_to_buffer
                      (const Wa__SyncdIndex *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__syncd_index__descriptor);
+  assert(message->descriptor == &wa__syncd_index__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncdIndex *
@@ -4087,7 +4087,7 @@ void   wa__syncd_index__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__syncd_index__descriptor);
+  assert(message->descriptor == &wa__syncd_index__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__syncd_mutation__init
@@ -4099,21 +4099,21 @@ void   wa__syncd_mutation__init
 size_t wa__syncd_mutation__get_packed_size
                      (const Wa__SyncdMutation *message)
 {
-  assert(message->base.descriptor == &wa__syncd_mutation__descriptor);
+  assert(message->descriptor == &wa__syncd_mutation__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__syncd_mutation__pack
                      (const Wa__SyncdMutation *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__syncd_mutation__descriptor);
+  assert(message->descriptor == &wa__syncd_mutation__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__syncd_mutation__pack_to_buffer
                      (const Wa__SyncdMutation *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__syncd_mutation__descriptor);
+  assert(message->descriptor == &wa__syncd_mutation__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncdMutation *
@@ -4132,7 +4132,7 @@ void   wa__syncd_mutation__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__syncd_mutation__descriptor);
+  assert(message->descriptor == &wa__syncd_mutation__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__syncd_mutations__init
@@ -4144,21 +4144,21 @@ void   wa__syncd_mutations__init
 size_t wa__syncd_mutations__get_packed_size
                      (const Wa__SyncdMutations *message)
 {
-  assert(message->base.descriptor == &wa__syncd_mutations__descriptor);
+  assert(message->descriptor == &wa__syncd_mutations__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__syncd_mutations__pack
                      (const Wa__SyncdMutations *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__syncd_mutations__descriptor);
+  assert(message->descriptor == &wa__syncd_mutations__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__syncd_mutations__pack_to_buffer
                      (const Wa__SyncdMutations *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__syncd_mutations__descriptor);
+  assert(message->descriptor == &wa__syncd_mutations__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncdMutations *
@@ -4177,7 +4177,7 @@ void   wa__syncd_mutations__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__syncd_mutations__descriptor);
+  assert(message->descriptor == &wa__syncd_mutations__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__syncd_patch__init
@@ -4189,21 +4189,21 @@ void   wa__syncd_patch__init
 size_t wa__syncd_patch__get_packed_size
                      (const Wa__SyncdPatch *message)
 {
-  assert(message->base.descriptor == &wa__syncd_patch__descriptor);
+  assert(message->descriptor == &wa__syncd_patch__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__syncd_patch__pack
                      (const Wa__SyncdPatch *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__syncd_patch__descriptor);
+  assert(message->descriptor == &wa__syncd_patch__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__syncd_patch__pack_to_buffer
                      (const Wa__SyncdPatch *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__syncd_patch__descriptor);
+  assert(message->descriptor == &wa__syncd_patch__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncdPatch *
@@ -4222,7 +4222,7 @@ void   wa__syncd_patch__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__syncd_patch__descriptor);
+  assert(message->descriptor == &wa__syncd_patch__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__syncd_record__init
@@ -4234,21 +4234,21 @@ void   wa__syncd_record__init
 size_t wa__syncd_record__get_packed_size
                      (const Wa__SyncdRecord *message)
 {
-  assert(message->base.descriptor == &wa__syncd_record__descriptor);
+  assert(message->descriptor == &wa__syncd_record__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__syncd_record__pack
                      (const Wa__SyncdRecord *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__syncd_record__descriptor);
+  assert(message->descriptor == &wa__syncd_record__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__syncd_record__pack_to_buffer
                      (const Wa__SyncdRecord *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__syncd_record__descriptor);
+  assert(message->descriptor == &wa__syncd_record__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncdRecord *
@@ -4267,7 +4267,7 @@ void   wa__syncd_record__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__syncd_record__descriptor);
+  assert(message->descriptor == &wa__syncd_record__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__syncd_snapshot__init
@@ -4279,21 +4279,21 @@ void   wa__syncd_snapshot__init
 size_t wa__syncd_snapshot__get_packed_size
                      (const Wa__SyncdSnapshot *message)
 {
-  assert(message->base.descriptor == &wa__syncd_snapshot__descriptor);
+  assert(message->descriptor == &wa__syncd_snapshot__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__syncd_snapshot__pack
                      (const Wa__SyncdSnapshot *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__syncd_snapshot__descriptor);
+  assert(message->descriptor == &wa__syncd_snapshot__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__syncd_snapshot__pack_to_buffer
                      (const Wa__SyncdSnapshot *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__syncd_snapshot__descriptor);
+  assert(message->descriptor == &wa__syncd_snapshot__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncdSnapshot *
@@ -4312,7 +4312,7 @@ void   wa__syncd_snapshot__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__syncd_snapshot__descriptor);
+  assert(message->descriptor == &wa__syncd_snapshot__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__syncd_value__init
@@ -4324,21 +4324,21 @@ void   wa__syncd_value__init
 size_t wa__syncd_value__get_packed_size
                      (const Wa__SyncdValue *message)
 {
-  assert(message->base.descriptor == &wa__syncd_value__descriptor);
+  assert(message->descriptor == &wa__syncd_value__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__syncd_value__pack
                      (const Wa__SyncdValue *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__syncd_value__descriptor);
+  assert(message->descriptor == &wa__syncd_value__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__syncd_value__pack_to_buffer
                      (const Wa__SyncdValue *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__syncd_value__descriptor);
+  assert(message->descriptor == &wa__syncd_value__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncdValue *
@@ -4357,7 +4357,7 @@ void   wa__syncd_value__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__syncd_value__descriptor);
+  assert(message->descriptor == &wa__syncd_value__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__syncd_version__init
@@ -4369,21 +4369,21 @@ void   wa__syncd_version__init
 size_t wa__syncd_version__get_packed_size
                      (const Wa__SyncdVersion *message)
 {
-  assert(message->base.descriptor == &wa__syncd_version__descriptor);
+  assert(message->descriptor == &wa__syncd_version__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__syncd_version__pack
                      (const Wa__SyncdVersion *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__syncd_version__descriptor);
+  assert(message->descriptor == &wa__syncd_version__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__syncd_version__pack_to_buffer
                      (const Wa__SyncdVersion *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__syncd_version__descriptor);
+  assert(message->descriptor == &wa__syncd_version__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__SyncdVersion *
@@ -4402,7 +4402,7 @@ void   wa__syncd_version__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__syncd_version__descriptor);
+  assert(message->descriptor == &wa__syncd_version__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__template_button__call_button__init
@@ -4432,21 +4432,21 @@ void   wa__template_button__init
 size_t wa__template_button__get_packed_size
                      (const Wa__TemplateButton *message)
 {
-  assert(message->base.descriptor == &wa__template_button__descriptor);
+  assert(message->descriptor == &wa__template_button__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__template_button__pack
                      (const Wa__TemplateButton *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__template_button__descriptor);
+  assert(message->descriptor == &wa__template_button__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__template_button__pack_to_buffer
                      (const Wa__TemplateButton *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__template_button__descriptor);
+  assert(message->descriptor == &wa__template_button__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__TemplateButton *
@@ -4465,7 +4465,7 @@ void   wa__template_button__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__template_button__descriptor);
+  assert(message->descriptor == &wa__template_button__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__user_receipt__init
@@ -4477,21 +4477,21 @@ void   wa__user_receipt__init
 size_t wa__user_receipt__get_packed_size
                      (const Wa__UserReceipt *message)
 {
-  assert(message->base.descriptor == &wa__user_receipt__descriptor);
+  assert(message->descriptor == &wa__user_receipt__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__user_receipt__pack
                      (const Wa__UserReceipt *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__user_receipt__descriptor);
+  assert(message->descriptor == &wa__user_receipt__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__user_receipt__pack_to_buffer
                      (const Wa__UserReceipt *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__user_receipt__descriptor);
+  assert(message->descriptor == &wa__user_receipt__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__UserReceipt *
@@ -4510,7 +4510,7 @@ void   wa__user_receipt__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__user_receipt__descriptor);
+  assert(message->descriptor == &wa__user_receipt__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__verified_name_certificate__details__init
@@ -4528,21 +4528,21 @@ void   wa__verified_name_certificate__init
 size_t wa__verified_name_certificate__get_packed_size
                      (const Wa__VerifiedNameCertificate *message)
 {
-  assert(message->base.descriptor == &wa__verified_name_certificate__descriptor);
+  assert(message->descriptor == &wa__verified_name_certificate__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__verified_name_certificate__pack
                      (const Wa__VerifiedNameCertificate *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__verified_name_certificate__descriptor);
+  assert(message->descriptor == &wa__verified_name_certificate__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__verified_name_certificate__pack_to_buffer
                      (const Wa__VerifiedNameCertificate *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__verified_name_certificate__descriptor);
+  assert(message->descriptor == &wa__verified_name_certificate__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__VerifiedNameCertificate *
@@ -4561,7 +4561,7 @@ void   wa__verified_name_certificate__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__verified_name_certificate__descriptor);
+  assert(message->descriptor == &wa__verified_name_certificate__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__wallpaper_settings__init
@@ -4573,21 +4573,21 @@ void   wa__wallpaper_settings__init
 size_t wa__wallpaper_settings__get_packed_size
                      (const Wa__WallpaperSettings *message)
 {
-  assert(message->base.descriptor == &wa__wallpaper_settings__descriptor);
+  assert(message->descriptor == &wa__wallpaper_settings__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__wallpaper_settings__pack
                      (const Wa__WallpaperSettings *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__wallpaper_settings__descriptor);
+  assert(message->descriptor == &wa__wallpaper_settings__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__wallpaper_settings__pack_to_buffer
                      (const Wa__WallpaperSettings *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__wallpaper_settings__descriptor);
+  assert(message->descriptor == &wa__wallpaper_settings__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__WallpaperSettings *
@@ -4606,7 +4606,7 @@ void   wa__wallpaper_settings__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__wallpaper_settings__descriptor);
+  assert(message->descriptor == &wa__wallpaper_settings__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__web_features__init
@@ -4618,21 +4618,21 @@ void   wa__web_features__init
 size_t wa__web_features__get_packed_size
                      (const Wa__WebFeatures *message)
 {
-  assert(message->base.descriptor == &wa__web_features__descriptor);
+  assert(message->descriptor == &wa__web_features__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__web_features__pack
                      (const Wa__WebFeatures *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__web_features__descriptor);
+  assert(message->descriptor == &wa__web_features__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__web_features__pack_to_buffer
                      (const Wa__WebFeatures *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__web_features__descriptor);
+  assert(message->descriptor == &wa__web_features__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__WebFeatures *
@@ -4651,7 +4651,7 @@ void   wa__web_features__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__web_features__descriptor);
+  assert(message->descriptor == &wa__web_features__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__web_message_info__init
@@ -4663,21 +4663,21 @@ void   wa__web_message_info__init
 size_t wa__web_message_info__get_packed_size
                      (const Wa__WebMessageInfo *message)
 {
-  assert(message->base.descriptor == &wa__web_message_info__descriptor);
+  assert(message->descriptor == &wa__web_message_info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__web_message_info__pack
                      (const Wa__WebMessageInfo *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__web_message_info__descriptor);
+  assert(message->descriptor == &wa__web_message_info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__web_message_info__pack_to_buffer
                      (const Wa__WebMessageInfo *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__web_message_info__descriptor);
+  assert(message->descriptor == &wa__web_message_info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__WebMessageInfo *
@@ -4696,7 +4696,7 @@ void   wa__web_message_info__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__web_message_info__descriptor);
+  assert(message->descriptor == &wa__web_message_info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   wa__web_notifications_info__init
@@ -4708,21 +4708,21 @@ void   wa__web_notifications_info__init
 size_t wa__web_notifications_info__get_packed_size
                      (const Wa__WebNotificationsInfo *message)
 {
-  assert(message->base.descriptor == &wa__web_notifications_info__descriptor);
+  assert(message->descriptor == &wa__web_notifications_info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
 size_t wa__web_notifications_info__pack
                      (const Wa__WebNotificationsInfo *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &wa__web_notifications_info__descriptor);
+  assert(message->descriptor == &wa__web_notifications_info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
 size_t wa__web_notifications_info__pack_to_buffer
                      (const Wa__WebNotificationsInfo *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &wa__web_notifications_info__descriptor);
+  assert(message->descriptor == &wa__web_notifications_info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
 Wa__WebNotificationsInfo *
@@ -4741,7 +4741,7 @@ void   wa__web_notifications_info__free_unpacked
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &wa__web_notifications_info__descriptor);
+  assert(message->descriptor == &wa__web_notifications_info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 static const ProtobufCFieldDescriptor wa__advdevice_identity__field_descriptors[3] =
diff --git a/protocols/WhatsApp/src/pmsg.pb-c.h b/protocols/WhatsApp/src/pmsg.pb-c.h
index 9290779c09..13f0097e67 100644
--- a/protocols/WhatsApp/src/pmsg.pb-c.h
+++ b/protocols/WhatsApp/src/pmsg.pb-c.h
@@ -14,232 +14,230 @@ PROTOBUF_C__BEGIN_DECLS
 # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
 #endif
 
-
-typedef struct _Wa__ADVDeviceIdentity Wa__ADVDeviceIdentity;
-typedef struct _Wa__ADVKeyIndexList Wa__ADVKeyIndexList;
-typedef struct _Wa__ADVSignedDeviceIdentity Wa__ADVSignedDeviceIdentity;
-typedef struct _Wa__ADVSignedDeviceIdentityHMAC Wa__ADVSignedDeviceIdentityHMAC;
-typedef struct _Wa__ADVSignedKeyIndexList Wa__ADVSignedKeyIndexList;
-typedef struct _Wa__ActionLink Wa__ActionLink;
-typedef struct _Wa__AutoDownloadSettings Wa__AutoDownloadSettings;
-typedef struct _Wa__BizAccountLinkInfo Wa__BizAccountLinkInfo;
-typedef struct _Wa__BizAccountPayload Wa__BizAccountPayload;
-typedef struct _Wa__BizIdentityInfo Wa__BizIdentityInfo;
-typedef struct _Wa__CertChain Wa__CertChain;
-typedef struct _Wa__CertChain__NoiseCertificate Wa__CertChain__NoiseCertificate;
-typedef struct _Wa__CertChain__NoiseCertificate__Details Wa__CertChain__NoiseCertificate__Details;
-typedef struct _Wa__Chain Wa__Chain;
-typedef struct _Wa__ChainKey Wa__ChainKey;
-typedef struct _Wa__ClientPayload Wa__ClientPayload;
-typedef struct _Wa__ClientPayload__DNSSource Wa__ClientPayload__DNSSource;
-typedef struct _Wa__ClientPayload__DevicePairingRegistrationData Wa__ClientPayload__DevicePairingRegistrationData;
-typedef struct _Wa__ClientPayload__UserAgent Wa__ClientPayload__UserAgent;
-typedef struct _Wa__ClientPayload__UserAgent__AppVersion Wa__ClientPayload__UserAgent__AppVersion;
-typedef struct _Wa__ClientPayload__WebInfo Wa__ClientPayload__WebInfo;
-typedef struct _Wa__ClientPayload__WebInfo__WebdPayload Wa__ClientPayload__WebInfo__WebdPayload;
-typedef struct _Wa__ContextInfo Wa__ContextInfo;
-typedef struct _Wa__ContextInfo__AdReplyInfo Wa__ContextInfo__AdReplyInfo;
-typedef struct _Wa__ContextInfo__ExternalAdReplyInfo Wa__ContextInfo__ExternalAdReplyInfo;
-typedef struct _Wa__Conversation Wa__Conversation;
-typedef struct _Wa__DeviceListMetadata Wa__DeviceListMetadata;
-typedef struct _Wa__DeviceProps Wa__DeviceProps;
-typedef struct _Wa__DeviceProps__AppVersion Wa__DeviceProps__AppVersion;
-typedef struct _Wa__DisappearingMode Wa__DisappearingMode;
-typedef struct _Wa__EphemeralSetting Wa__EphemeralSetting;
-typedef struct _Wa__ExitCode Wa__ExitCode;
-typedef struct _Wa__ExternalBlobReference Wa__ExternalBlobReference;
-typedef struct _Wa__GlobalSettings Wa__GlobalSettings;
-typedef struct _Wa__GroupParticipant Wa__GroupParticipant;
-typedef struct _Wa__HandshakeMessage Wa__HandshakeMessage;
-typedef struct _Wa__HandshakeMessage__ClientFinish Wa__HandshakeMessage__ClientFinish;
-typedef struct _Wa__HandshakeMessage__ClientHello Wa__HandshakeMessage__ClientHello;
-typedef struct _Wa__HandshakeMessage__ServerHello Wa__HandshakeMessage__ServerHello;
-typedef struct _Wa__HistorySync Wa__HistorySync;
-typedef struct _Wa__HistorySyncMsg Wa__HistorySyncMsg;
-typedef struct _Wa__HydratedTemplateButton Wa__HydratedTemplateButton;
-typedef struct _Wa__HydratedTemplateButton__HydratedCallButton Wa__HydratedTemplateButton__HydratedCallButton;
-typedef struct _Wa__HydratedTemplateButton__HydratedQuickReplyButton Wa__HydratedTemplateButton__HydratedQuickReplyButton;
-typedef struct _Wa__HydratedTemplateButton__HydratedURLButton Wa__HydratedTemplateButton__HydratedURLButton;
-typedef struct _Wa__IdentityKeyPairStructure Wa__IdentityKeyPairStructure;
-typedef struct _Wa__InteractiveAnnotation Wa__InteractiveAnnotation;
-typedef struct _Wa__KeepInChat Wa__KeepInChat;
-typedef struct _Wa__KeyId Wa__KeyId;
-typedef struct _Wa__LocalizedName Wa__LocalizedName;
-typedef struct _Wa__Location Wa__Location;
-typedef struct _Wa__MediaData Wa__MediaData;
-typedef struct _Wa__MediaRetryNotification Wa__MediaRetryNotification;
-typedef struct _Wa__Message Wa__Message;
-typedef struct _Wa__Message__AppStateFatalExceptionNotification Wa__Message__AppStateFatalExceptionNotification;
-typedef struct _Wa__Message__AppStateSyncKeyData Wa__Message__AppStateSyncKeyData;
-typedef struct _Wa__Message__AppStateSyncKeyFingerprint Wa__Message__AppStateSyncKeyFingerprint;
-typedef struct _Wa__Message__AppStateSyncKeyId Wa__Message__AppStateSyncKeyId;
-typedef struct _Wa__Message__AppStateSyncKeyRequest Wa__Message__AppStateSyncKeyRequest;
-typedef struct _Wa__Message__AppStateSyncKeyShare Wa__Message__AppStateSyncKeyShare;
-typedef struct _Wa__Message__AppStateSyncKey Wa__Message__AppStateSyncKey;
-typedef struct _Wa__Message__AudioMessage Wa__Message__AudioMessage;
-typedef struct _Wa__Message__ButtonsMessage Wa__Message__ButtonsMessage;
-typedef struct _Wa__Message__ButtonsMessage__Button Wa__Message__ButtonsMessage__Button;
-typedef struct _Wa__Message__ButtonsMessage__Button__ButtonText Wa__Message__ButtonsMessage__Button__ButtonText;
-typedef struct _Wa__Message__ButtonsMessage__Button__NativeFlowInfo Wa__Message__ButtonsMessage__Button__NativeFlowInfo;
-typedef struct _Wa__Message__ButtonsResponseMessage Wa__Message__ButtonsResponseMessage;
-typedef struct _Wa__Message__Call Wa__Message__Call;
-typedef struct _Wa__Message__CancelPaymentRequestMessage Wa__Message__CancelPaymentRequestMessage;
-typedef struct _Wa__Message__Chat Wa__Message__Chat;
-typedef struct _Wa__Message__ContactMessage Wa__Message__ContactMessage;
-typedef struct _Wa__Message__ContactsArrayMessage Wa__Message__ContactsArrayMessage;
-typedef struct _Wa__Message__DeclinePaymentRequestMessage Wa__Message__DeclinePaymentRequestMessage;
-typedef struct _Wa__Message__DeviceSentMessage Wa__Message__DeviceSentMessage;
-typedef struct _Wa__Message__DocumentMessage Wa__Message__DocumentMessage;
-typedef struct _Wa__Message__ExtendedTextMessage Wa__Message__ExtendedTextMessage;
-typedef struct _Wa__Message__FutureProofMessage Wa__Message__FutureProofMessage;
-typedef struct _Wa__Message__GroupInviteMessage Wa__Message__GroupInviteMessage;
-typedef struct _Wa__Message__HighlyStructuredMessage Wa__Message__HighlyStructuredMessage;
-typedef struct _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter;
-typedef struct _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMCurrency Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMCurrency;
-typedef struct _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime;
-typedef struct _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeComponent Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeComponent;
-typedef struct _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeUnixEpoch Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeUnixEpoch;
-typedef struct _Wa__Message__HistorySyncNotification Wa__Message__HistorySyncNotification;
-typedef struct _Wa__Message__ImageMessage Wa__Message__ImageMessage;
-typedef struct _Wa__Message__InitialSecurityNotificationSettingSync Wa__Message__InitialSecurityNotificationSettingSync;
-typedef struct _Wa__Message__InteractiveMessage Wa__Message__InteractiveMessage;
-typedef struct _Wa__Message__InteractiveMessage__Body Wa__Message__InteractiveMessage__Body;
-typedef struct _Wa__Message__InteractiveMessage__CollectionMessage Wa__Message__InteractiveMessage__CollectionMessage;
-typedef struct _Wa__Message__InteractiveMessage__Footer Wa__Message__InteractiveMessage__Footer;
-typedef struct _Wa__Message__InteractiveMessage__Header Wa__Message__InteractiveMessage__Header;
-typedef struct _Wa__Message__InteractiveMessage__NativeFlowMessage Wa__Message__InteractiveMessage__NativeFlowMessage;
-typedef struct _Wa__Message__InteractiveMessage__NativeFlowMessage__NativeFlowButton Wa__Message__InteractiveMessage__NativeFlowMessage__NativeFlowButton;
-typedef struct _Wa__Message__InteractiveMessage__ShopMessage Wa__Message__InteractiveMessage__ShopMessage;
-typedef struct _Wa__Message__InteractiveResponseMessage Wa__Message__InteractiveResponseMessage;
-typedef struct _Wa__Message__InteractiveResponseMessage__Body Wa__Message__InteractiveResponseMessage__Body;
-typedef struct _Wa__Message__InteractiveResponseMessage__NativeFlowResponseMessage Wa__Message__InteractiveResponseMessage__NativeFlowResponseMessage;
-typedef struct _Wa__Message__InvoiceMessage Wa__Message__InvoiceMessage;
-typedef struct _Wa__Message__KeepInChatMessage Wa__Message__KeepInChatMessage;
-typedef struct _Wa__Message__ListMessage Wa__Message__ListMessage;
-typedef struct _Wa__Message__ListMessage__ProductListHeaderImage Wa__Message__ListMessage__ProductListHeaderImage;
-typedef struct _Wa__Message__ListMessage__ProductListInfo Wa__Message__ListMessage__ProductListInfo;
-typedef struct _Wa__Message__ListMessage__ProductSection Wa__Message__ListMessage__ProductSection;
-typedef struct _Wa__Message__ListMessage__Product Wa__Message__ListMessage__Product;
-typedef struct _Wa__Message__ListMessage__Row Wa__Message__ListMessage__Row;
-typedef struct _Wa__Message__ListMessage__Section Wa__Message__ListMessage__Section;
-typedef struct _Wa__Message__ListResponseMessage Wa__Message__ListResponseMessage;
-typedef struct _Wa__Message__ListResponseMessage__SingleSelectReply Wa__Message__ListResponseMessage__SingleSelectReply;
-typedef struct _Wa__Message__LiveLocationMessage Wa__Message__LiveLocationMessage;
-typedef struct _Wa__Message__LocationMessage Wa__Message__LocationMessage;
-typedef struct _Wa__Message__OrderMessage Wa__Message__OrderMessage;
-typedef struct _Wa__Message__PaymentInviteMessage Wa__Message__PaymentInviteMessage;
-typedef struct _Wa__Message__PollCreationMessage Wa__Message__PollCreationMessage;
-typedef struct _Wa__Message__PollCreationMessage__Option Wa__Message__PollCreationMessage__Option;
-typedef struct _Wa__Message__PollEncValue Wa__Message__PollEncValue;
-typedef struct _Wa__Message__PollUpdateMessageMetadata Wa__Message__PollUpdateMessageMetadata;
-typedef struct _Wa__Message__PollUpdateMessage Wa__Message__PollUpdateMessage;
-typedef struct _Wa__Message__PollVoteMessage Wa__Message__PollVoteMessage;
-typedef struct _Wa__Message__ProductMessage Wa__Message__ProductMessage;
-typedef struct _Wa__Message__ProductMessage__CatalogSnapshot Wa__Message__ProductMessage__CatalogSnapshot;
-typedef struct _Wa__Message__ProductMessage__ProductSnapshot Wa__Message__ProductMessage__ProductSnapshot;
-typedef struct _Wa__Message__ProtocolMessage Wa__Message__ProtocolMessage;
-typedef struct _Wa__Message__ReactionMessage Wa__Message__ReactionMessage;
-typedef struct _Wa__Message__RequestMediaUploadMessage Wa__Message__RequestMediaUploadMessage;
-typedef struct _Wa__Message__RequestMediaUploadResponseMessage Wa__Message__RequestMediaUploadResponseMessage;
-typedef struct _Wa__Message__RequestMediaUploadResponseMessage__RequestMediaUploadResult Wa__Message__RequestMediaUploadResponseMessage__RequestMediaUploadResult;
-typedef struct _Wa__Message__RequestPaymentMessage Wa__Message__RequestPaymentMessage;
-typedef struct _Wa__Message__RequestPhoneNumberMessage Wa__Message__RequestPhoneNumberMessage;
-typedef struct _Wa__Message__SendPaymentMessage Wa__Message__SendPaymentMessage;
-typedef struct _Wa__Message__SenderKeyDistributionMessage Wa__Message__SenderKeyDistributionMessage;
-typedef struct _Wa__Message__StickerMessage Wa__Message__StickerMessage;
-typedef struct _Wa__Message__StickerSyncRMRMessage Wa__Message__StickerSyncRMRMessage;
-typedef struct _Wa__Message__TemplateButtonReplyMessage Wa__Message__TemplateButtonReplyMessage;
-typedef struct _Wa__Message__TemplateMessage Wa__Message__TemplateMessage;
-typedef struct _Wa__Message__TemplateMessage__FourRowTemplate Wa__Message__TemplateMessage__FourRowTemplate;
-typedef struct _Wa__Message__TemplateMessage__HydratedFourRowTemplate Wa__Message__TemplateMessage__HydratedFourRowTemplate;
-typedef struct _Wa__Message__VideoMessage Wa__Message__VideoMessage;
-typedef struct _Wa__MessageContextInfo Wa__MessageContextInfo;
-typedef struct _Wa__MessageKey Wa__MessageKey;
-typedef struct _Wa__Money Wa__Money;
-typedef struct _Wa__MsgOpaqueData Wa__MsgOpaqueData;
-typedef struct _Wa__MsgOpaqueData__PollOption Wa__MsgOpaqueData__PollOption;
-typedef struct _Wa__MsgRowOpaqueData Wa__MsgRowOpaqueData;
-typedef struct _Wa__NoiseCertificate Wa__NoiseCertificate;
-typedef struct _Wa__NoiseCertificate__Details Wa__NoiseCertificate__Details;
-typedef struct _Wa__NotificationMessageInfo Wa__NotificationMessageInfo;
-typedef struct _Wa__PastParticipant Wa__PastParticipant;
-typedef struct _Wa__PastParticipants Wa__PastParticipants;
-typedef struct _Wa__PaymentBackground Wa__PaymentBackground;
-typedef struct _Wa__PaymentBackground__MediaData Wa__PaymentBackground__MediaData;
-typedef struct _Wa__PaymentInfo Wa__PaymentInfo;
-typedef struct _Wa__PendingKeyExchange Wa__PendingKeyExchange;
-typedef struct _Wa__PendingPreKey Wa__PendingPreKey;
-typedef struct _Wa__PhotoChange Wa__PhotoChange;
-typedef struct _Wa__Point Wa__Point;
-typedef struct _Wa__PollAdditionalMetadata Wa__PollAdditionalMetadata;
-typedef struct _Wa__PollEncValue Wa__PollEncValue;
-typedef struct _Wa__PollUpdate Wa__PollUpdate;
-typedef struct _Wa__PreKeyRecordStructure Wa__PreKeyRecordStructure;
-typedef struct _Wa__Pushname Wa__Pushname;
-typedef struct _Wa__Reaction Wa__Reaction;
-typedef struct _Wa__RecentEmojiWeight Wa__RecentEmojiWeight;
-typedef struct _Wa__RecordStructure Wa__RecordStructure;
-typedef struct _Wa__SenderChainKey Wa__SenderChainKey;
-typedef struct _Wa__SenderKeyRecordStructure Wa__SenderKeyRecordStructure;
-typedef struct _Wa__SenderKeyStateStructure Wa__SenderKeyStateStructure;
-typedef struct _Wa__SenderMessageKey Wa__SenderMessageKey;
-typedef struct _Wa__SenderSigningKey Wa__SenderSigningKey;
-typedef struct _Wa__ServerErrorReceipt Wa__ServerErrorReceipt;
-typedef struct _Wa__SessionStructure Wa__SessionStructure;
-typedef struct _Wa__SignedPreKeyRecordStructure Wa__SignedPreKeyRecordStructure;
-typedef struct _Wa__StatusPSA Wa__StatusPSA;
-typedef struct _Wa__StickerMetadata Wa__StickerMetadata;
-typedef struct _Wa__SyncActionData Wa__SyncActionData;
-typedef struct _Wa__SyncActionValue Wa__SyncActionValue;
-typedef struct _Wa__SyncActionValue__AgentAction Wa__SyncActionValue__AgentAction;
-typedef struct _Wa__SyncActionValue__AndroidUnsupportedActions Wa__SyncActionValue__AndroidUnsupportedActions;
-typedef struct _Wa__SyncActionValue__ArchiveChatAction Wa__SyncActionValue__ArchiveChatAction;
-typedef struct _Wa__SyncActionValue__ClearChatAction Wa__SyncActionValue__ClearChatAction;
-typedef struct _Wa__SyncActionValue__ContactAction Wa__SyncActionValue__ContactAction;
-typedef struct _Wa__SyncActionValue__DeleteChatAction Wa__SyncActionValue__DeleteChatAction;
-typedef struct _Wa__SyncActionValue__DeleteMessageForMeAction Wa__SyncActionValue__DeleteMessageForMeAction;
-typedef struct _Wa__SyncActionValue__KeyExpiration Wa__SyncActionValue__KeyExpiration;
-typedef struct _Wa__SyncActionValue__LabelAssociationAction Wa__SyncActionValue__LabelAssociationAction;
-typedef struct _Wa__SyncActionValue__LabelEditAction Wa__SyncActionValue__LabelEditAction;
-typedef struct _Wa__SyncActionValue__LocaleSetting Wa__SyncActionValue__LocaleSetting;
-typedef struct _Wa__SyncActionValue__MarkChatAsReadAction Wa__SyncActionValue__MarkChatAsReadAction;
-typedef struct _Wa__SyncActionValue__MuteAction Wa__SyncActionValue__MuteAction;
-typedef struct _Wa__SyncActionValue__NuxAction Wa__SyncActionValue__NuxAction;
-typedef struct _Wa__SyncActionValue__PinAction Wa__SyncActionValue__PinAction;
-typedef struct _Wa__SyncActionValue__PrimaryFeature Wa__SyncActionValue__PrimaryFeature;
-typedef struct _Wa__SyncActionValue__PrimaryVersionAction Wa__SyncActionValue__PrimaryVersionAction;
-typedef struct _Wa__SyncActionValue__PushNameSetting Wa__SyncActionValue__PushNameSetting;
-typedef struct _Wa__SyncActionValue__QuickReplyAction Wa__SyncActionValue__QuickReplyAction;
-typedef struct _Wa__SyncActionValue__RecentEmojiWeightsAction Wa__SyncActionValue__RecentEmojiWeightsAction;
-typedef struct _Wa__SyncActionValue__SecurityNotificationSetting Wa__SyncActionValue__SecurityNotificationSetting;
-typedef struct _Wa__SyncActionValue__StarAction Wa__SyncActionValue__StarAction;
-typedef struct _Wa__SyncActionValue__StickerAction Wa__SyncActionValue__StickerAction;
-typedef struct _Wa__SyncActionValue__SubscriptionAction Wa__SyncActionValue__SubscriptionAction;
-typedef struct _Wa__SyncActionValue__SyncActionMessageRange Wa__SyncActionValue__SyncActionMessageRange;
-typedef struct _Wa__SyncActionValue__SyncActionMessage Wa__SyncActionValue__SyncActionMessage;
-typedef struct _Wa__SyncActionValue__TimeFormatAction Wa__SyncActionValue__TimeFormatAction;
-typedef struct _Wa__SyncActionValue__UnarchiveChatsSetting Wa__SyncActionValue__UnarchiveChatsSetting;
-typedef struct _Wa__SyncActionValue__UserStatusMuteAction Wa__SyncActionValue__UserStatusMuteAction;
-typedef struct _Wa__SyncdIndex Wa__SyncdIndex;
-typedef struct _Wa__SyncdMutation Wa__SyncdMutation;
-typedef struct _Wa__SyncdMutations Wa__SyncdMutations;
-typedef struct _Wa__SyncdPatch Wa__SyncdPatch;
-typedef struct _Wa__SyncdRecord Wa__SyncdRecord;
-typedef struct _Wa__SyncdSnapshot Wa__SyncdSnapshot;
-typedef struct _Wa__SyncdValue Wa__SyncdValue;
-typedef struct _Wa__SyncdVersion Wa__SyncdVersion;
-typedef struct _Wa__TemplateButton Wa__TemplateButton;
-typedef struct _Wa__TemplateButton__CallButton Wa__TemplateButton__CallButton;
-typedef struct _Wa__TemplateButton__QuickReplyButton Wa__TemplateButton__QuickReplyButton;
-typedef struct _Wa__TemplateButton__URLButton Wa__TemplateButton__URLButton;
-typedef struct _Wa__UserReceipt Wa__UserReceipt;
-typedef struct _Wa__VerifiedNameCertificate Wa__VerifiedNameCertificate;
-typedef struct _Wa__VerifiedNameCertificate__Details Wa__VerifiedNameCertificate__Details;
-typedef struct _Wa__WallpaperSettings Wa__WallpaperSettings;
-typedef struct _Wa__WebFeatures Wa__WebFeatures;
-typedef struct _Wa__WebMessageInfo Wa__WebMessageInfo;
-typedef struct _Wa__WebNotificationsInfo Wa__WebNotificationsInfo;
-
+struct Wa__ADVDeviceIdentity;
+struct Wa__ADVKeyIndexList;
+struct Wa__ADVSignedDeviceIdentity;
+struct Wa__ADVSignedDeviceIdentityHMAC;
+struct Wa__ADVSignedKeyIndexList;
+struct Wa__ActionLink;
+struct Wa__AutoDownloadSettings;
+struct Wa__BizAccountLinkInfo;
+struct Wa__BizAccountPayload;
+struct Wa__BizIdentityInfo;
+struct Wa__CertChain;
+struct Wa__CertChain__NoiseCertificate;
+struct Wa__CertChain__NoiseCertificate__Details;
+struct Wa__Chain;
+struct Wa__ChainKey;
+struct Wa__ClientPayload;
+struct Wa__ClientPayload__DNSSource;
+struct Wa__ClientPayload__DevicePairingRegistrationData;
+struct Wa__ClientPayload__UserAgent;
+struct Wa__ClientPayload__UserAgent__AppVersion;
+struct Wa__ClientPayload__WebInfo;
+struct Wa__ClientPayload__WebInfo__WebdPayload;
+struct Wa__ContextInfo;
+struct Wa__ContextInfo__AdReplyInfo;
+struct Wa__ContextInfo__ExternalAdReplyInfo;
+struct Wa__Conversation;
+struct Wa__DeviceListMetadata;
+struct Wa__DeviceProps;
+struct Wa__DeviceProps__AppVersion;
+struct Wa__DisappearingMode;
+struct Wa__EphemeralSetting;
+struct Wa__ExitCode;
+struct Wa__ExternalBlobReference;
+struct Wa__GlobalSettings;
+struct Wa__GroupParticipant;
+struct Wa__HandshakeMessage;
+struct Wa__HandshakeMessage__ClientFinish;
+struct Wa__HandshakeMessage__ClientHello;
+struct Wa__HandshakeMessage__ServerHello;
+struct Wa__HistorySync;
+struct Wa__HistorySyncMsg;
+struct Wa__HydratedTemplateButton;
+struct Wa__HydratedTemplateButton__HydratedCallButton;
+struct Wa__HydratedTemplateButton__HydratedQuickReplyButton;
+struct Wa__HydratedTemplateButton__HydratedURLButton;
+struct Wa__IdentityKeyPairStructure;
+struct Wa__InteractiveAnnotation;
+struct Wa__KeepInChat;
+struct Wa__KeyId;
+struct Wa__LocalizedName;
+struct Wa__Location;
+struct Wa__MediaData;
+struct Wa__MediaRetryNotification;
+struct Wa__Message;
+struct Wa__Message__AppStateFatalExceptionNotification;
+struct Wa__Message__AppStateSyncKeyData;
+struct Wa__Message__AppStateSyncKeyFingerprint;
+struct Wa__Message__AppStateSyncKeyId;
+struct Wa__Message__AppStateSyncKeyRequest;
+struct Wa__Message__AppStateSyncKeyShare;
+struct Wa__Message__AppStateSyncKey;
+struct Wa__Message__AudioMessage;
+struct Wa__Message__ButtonsMessage;
+struct Wa__Message__ButtonsMessage__Button;
+struct Wa__Message__ButtonsMessage__Button__ButtonText;
+struct Wa__Message__ButtonsMessage__Button__NativeFlowInfo;
+struct Wa__Message__ButtonsResponseMessage;
+struct Wa__Message__Call;
+struct Wa__Message__CancelPaymentRequestMessage;
+struct Wa__Message__Chat;
+struct Wa__Message__ContactMessage;
+struct Wa__Message__ContactsArrayMessage;
+struct Wa__Message__DeclinePaymentRequestMessage;
+struct Wa__Message__DeviceSentMessage;
+struct Wa__Message__DocumentMessage;
+struct Wa__Message__ExtendedTextMessage;
+struct Wa__Message__FutureProofMessage;
+struct Wa__Message__GroupInviteMessage;
+struct Wa__Message__HighlyStructuredMessage;
+struct Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter;
+struct Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMCurrency;
+struct Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime;
+struct Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeComponent;
+struct Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeUnixEpoch;
+struct Wa__Message__HistorySyncNotification;
+struct Wa__Message__ImageMessage;
+struct Wa__Message__InitialSecurityNotificationSettingSync;
+struct Wa__Message__InteractiveMessage;
+struct Wa__Message__InteractiveMessage__Body;
+struct Wa__Message__InteractiveMessage__CollectionMessage;
+struct Wa__Message__InteractiveMessage__Footer;
+struct Wa__Message__InteractiveMessage__Header;
+struct Wa__Message__InteractiveMessage__NativeFlowMessage;
+struct Wa__Message__InteractiveMessage__NativeFlowMessage__NativeFlowButton;
+struct Wa__Message__InteractiveMessage__ShopMessage;
+struct Wa__Message__InteractiveResponseMessage;
+struct Wa__Message__InteractiveResponseMessage__Body;
+struct Wa__Message__InteractiveResponseMessage__NativeFlowResponseMessage;
+struct Wa__Message__InvoiceMessage;
+struct Wa__Message__KeepInChatMessage;
+struct Wa__Message__ListMessage;
+struct Wa__Message__ListMessage__ProductListHeaderImage;
+struct Wa__Message__ListMessage__ProductListInfo;
+struct Wa__Message__ListMessage__ProductSection;
+struct Wa__Message__ListMessage__Product;
+struct Wa__Message__ListMessage__Row;
+struct Wa__Message__ListMessage__Section;
+struct Wa__Message__ListResponseMessage;
+struct Wa__Message__ListResponseMessage__SingleSelectReply;
+struct Wa__Message__LiveLocationMessage;
+struct Wa__Message__LocationMessage;
+struct Wa__Message__OrderMessage;
+struct Wa__Message__PaymentInviteMessage;
+struct Wa__Message__PollCreationMessage;
+struct Wa__Message__PollCreationMessage__Option;
+struct Wa__Message__PollEncValue;
+struct Wa__Message__PollUpdateMessageMetadata;
+struct Wa__Message__PollUpdateMessage;
+struct Wa__Message__PollVoteMessage;
+struct Wa__Message__ProductMessage;
+struct Wa__Message__ProductMessage__CatalogSnapshot;
+struct Wa__Message__ProductMessage__ProductSnapshot;
+struct Wa__Message__ProtocolMessage;
+struct Wa__Message__ReactionMessage;
+struct Wa__Message__RequestMediaUploadMessage;
+struct Wa__Message__RequestMediaUploadResponseMessage;
+struct Wa__Message__RequestMediaUploadResponseMessage__RequestMediaUploadResult;
+struct Wa__Message__RequestPaymentMessage;
+struct Wa__Message__RequestPhoneNumberMessage;
+struct Wa__Message__SendPaymentMessage;
+struct Wa__Message__SenderKeyDistributionMessage;
+struct Wa__Message__StickerMessage;
+struct Wa__Message__StickerSyncRMRMessage;
+struct Wa__Message__TemplateButtonReplyMessage;
+struct Wa__Message__TemplateMessage;
+struct Wa__Message__TemplateMessage__FourRowTemplate;
+struct Wa__Message__TemplateMessage__HydratedFourRowTemplate;
+struct Wa__Message__VideoMessage;
+struct Wa__MessageContextInfo;
+struct Wa__MessageKey;
+struct Wa__Money;
+struct Wa__MsgOpaqueData;
+struct Wa__MsgOpaqueData__PollOption;
+struct Wa__MsgRowOpaqueData;
+struct Wa__NoiseCertificate;
+struct Wa__NoiseCertificate__Details;
+struct Wa__NotificationMessageInfo;
+struct Wa__PastParticipant;
+struct Wa__PastParticipants;
+struct Wa__PaymentBackground;
+struct Wa__PaymentBackground__MediaData;
+struct Wa__PaymentInfo;
+struct Wa__PendingKeyExchange;
+struct Wa__PendingPreKey;
+struct Wa__PhotoChange;
+struct Wa__Point;
+struct Wa__PollAdditionalMetadata;
+struct Wa__PollEncValue;
+struct Wa__PollUpdate;
+struct Wa__PreKeyRecordStructure;
+struct Wa__Pushname;
+struct Wa__Reaction;
+struct Wa__RecentEmojiWeight;
+struct Wa__RecordStructure;
+struct Wa__SenderChainKey;
+struct Wa__SenderKeyRecordStructure;
+struct Wa__SenderKeyStateStructure;
+struct Wa__SenderMessageKey;
+struct Wa__SenderSigningKey;
+struct Wa__ServerErrorReceipt;
+struct Wa__SessionStructure;
+struct Wa__SignedPreKeyRecordStructure;
+struct Wa__StatusPSA;
+struct Wa__StickerMetadata;
+struct Wa__SyncActionData;
+struct Wa__SyncActionValue;
+struct Wa__SyncActionValue__AgentAction;
+struct Wa__SyncActionValue__AndroidUnsupportedActions;
+struct Wa__SyncActionValue__ArchiveChatAction;
+struct Wa__SyncActionValue__ClearChatAction;
+struct Wa__SyncActionValue__ContactAction;
+struct Wa__SyncActionValue__DeleteChatAction;
+struct Wa__SyncActionValue__DeleteMessageForMeAction;
+struct Wa__SyncActionValue__KeyExpiration;
+struct Wa__SyncActionValue__LabelAssociationAction;
+struct Wa__SyncActionValue__LabelEditAction;
+struct Wa__SyncActionValue__LocaleSetting;
+struct Wa__SyncActionValue__MarkChatAsReadAction;
+struct Wa__SyncActionValue__MuteAction;
+struct Wa__SyncActionValue__NuxAction;
+struct Wa__SyncActionValue__PinAction;
+struct Wa__SyncActionValue__PrimaryFeature;
+struct Wa__SyncActionValue__PrimaryVersionAction;
+struct Wa__SyncActionValue__PushNameSetting;
+struct Wa__SyncActionValue__QuickReplyAction;
+struct Wa__SyncActionValue__RecentEmojiWeightsAction;
+struct Wa__SyncActionValue__SecurityNotificationSetting;
+struct Wa__SyncActionValue__StarAction;
+struct Wa__SyncActionValue__StickerAction;
+struct Wa__SyncActionValue__SubscriptionAction;
+struct Wa__SyncActionValue__SyncActionMessageRange;
+struct Wa__SyncActionValue__SyncActionMessage;
+struct Wa__SyncActionValue__TimeFormatAction;
+struct Wa__SyncActionValue__UnarchiveChatsSetting;
+struct Wa__SyncActionValue__UserStatusMuteAction;
+struct Wa__SyncdIndex;
+struct Wa__SyncdMutation;
+struct Wa__SyncdMutations;
+struct Wa__SyncdPatch;
+struct Wa__SyncdRecord;
+struct Wa__SyncdSnapshot;
+struct Wa__SyncdValue;
+struct Wa__SyncdVersion;
+struct Wa__TemplateButton;
+struct Wa__TemplateButton__CallButton;
+struct Wa__TemplateButton__QuickReplyButton;
+struct Wa__TemplateButton__URLButton;
+struct Wa__UserReceipt;
+struct Wa__VerifiedNameCertificate;
+struct Wa__VerifiedNameCertificate__Details;
+struct Wa__WallpaperSettings;
+struct Wa__WebFeatures;
+struct Wa__WebMessageInfo;
+struct Wa__WebNotificationsInfo;
 
 /* --- enums --- */
 
@@ -818,9 +816,8 @@ typedef enum _Wa__MediaVisibility {
 
 /* --- messages --- */
 
-struct  _Wa__ADVDeviceIdentity
+struct  Wa__ADVDeviceIdentity : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_rawid;
   uint32_t rawid;
   protobuf_c_boolean has_timestamp;
@@ -833,9 +830,8 @@ struct  _Wa__ADVDeviceIdentity
     , 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__ADVKeyIndexList
+struct  Wa__ADVKeyIndexList : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_rawid;
   uint32_t rawid;
   protobuf_c_boolean has_timestamp;
@@ -850,9 +846,8 @@ struct  _Wa__ADVKeyIndexList
     , 0, 0, 0, 0, 0, 0, 0,NULL }
 
 
-struct  _Wa__ADVSignedDeviceIdentity
+struct  Wa__ADVSignedDeviceIdentity : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_details;
   ProtobufCBinaryData details;
   protobuf_c_boolean has_accountsignaturekey;
@@ -867,9 +862,8 @@ struct  _Wa__ADVSignedDeviceIdentity
     , 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__ADVSignedDeviceIdentityHMAC
+struct  Wa__ADVSignedDeviceIdentityHMAC : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_details;
   ProtobufCBinaryData details;
   protobuf_c_boolean has_hmac;
@@ -880,9 +874,8 @@ struct  _Wa__ADVSignedDeviceIdentityHMAC
     , 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__ADVSignedKeyIndexList
+struct  Wa__ADVSignedKeyIndexList : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_details;
   ProtobufCBinaryData details;
   protobuf_c_boolean has_accountsignature;
@@ -893,9 +886,8 @@ struct  _Wa__ADVSignedKeyIndexList
     , 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__ActionLink
+struct  Wa__ActionLink : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *url;
   char *buttontitle;
 };
@@ -904,9 +896,8 @@ struct  _Wa__ActionLink
     , NULL, NULL }
 
 
-struct  _Wa__AutoDownloadSettings
+struct  Wa__AutoDownloadSettings : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_downloadimages;
   protobuf_c_boolean downloadimages;
   protobuf_c_boolean has_downloadaudio;
@@ -921,9 +912,8 @@ struct  _Wa__AutoDownloadSettings
     , 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__BizAccountLinkInfo
+struct  Wa__BizAccountLinkInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_whatsappbizacctfbid;
   uint64_t whatsappbizacctfbid;
   char *whatsappacctnumber;
@@ -939,9 +929,8 @@ struct  _Wa__BizAccountLinkInfo
     , 0, 0, NULL, 0, 0, 0, WA__BIZ_ACCOUNT_LINK_INFO__HOST_STORAGE_TYPE__ON_PREMISE, 0, WA__BIZ_ACCOUNT_LINK_INFO__ACCOUNT_TYPE__ENTERPRISE }
 
 
-struct  _Wa__BizAccountPayload
+struct  Wa__BizAccountPayload : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__VerifiedNameCertificate *vnamecert;
   protobuf_c_boolean has_bizacctlinkinfo;
   ProtobufCBinaryData bizacctlinkinfo;
@@ -951,9 +940,8 @@ struct  _Wa__BizAccountPayload
     , NULL, 0, {0,NULL} }
 
 
-struct  _Wa__BizIdentityInfo
+struct  Wa__BizIdentityInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_vlevel;
   Wa__BizIdentityInfo__VerifiedLevelValue vlevel;
   Wa__VerifiedNameCertificate *vnamecert;
@@ -975,9 +963,8 @@ struct  _Wa__BizIdentityInfo
     , 0, WA__BIZ_IDENTITY_INFO__VERIFIED_LEVEL_VALUE__UNKNOWN, NULL, 0, 0, 0, 0, 0, WA__BIZ_IDENTITY_INFO__HOST_STORAGE_TYPE__ON_PREMISE, 0, WA__BIZ_IDENTITY_INFO__ACTUAL_ACTORS_TYPE__SELF, 0, 0, 0, 0 }
 
 
-struct  _Wa__CertChain__NoiseCertificate__Details
+struct  Wa__CertChain__NoiseCertificate__Details : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_serial;
   uint32_t serial;
   protobuf_c_boolean has_issuerserial;
@@ -994,9 +981,8 @@ struct  _Wa__CertChain__NoiseCertificate__Details
     , 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0, 0 }
 
 
-struct  _Wa__CertChain__NoiseCertificate
+struct  Wa__CertChain__NoiseCertificate : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_details;
   ProtobufCBinaryData details;
   protobuf_c_boolean has_signature;
@@ -1007,9 +993,8 @@ struct  _Wa__CertChain__NoiseCertificate
     , 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__CertChain
+struct  Wa__CertChain : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__CertChain__NoiseCertificate *leaf;
   Wa__CertChain__NoiseCertificate *intermediate;
 };
@@ -1018,9 +1003,8 @@ struct  _Wa__CertChain
     , NULL, NULL }
 
 
-struct  _Wa__Chain
+struct  Wa__Chain : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_senderratchetkey;
   ProtobufCBinaryData senderratchetkey;
   protobuf_c_boolean has_senderratchetkeyprivate;
@@ -1034,9 +1018,8 @@ struct  _Wa__Chain
     , 0, {0,NULL}, 0, {0,NULL}, NULL, 0,NULL }
 
 
-struct  _Wa__ChainKey
+struct  Wa__ChainKey : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_index;
   uint32_t index;
   protobuf_c_boolean has_key;
@@ -1047,9 +1030,8 @@ struct  _Wa__ChainKey
     , 0, 0, 0, {0,NULL} }
 
 
-struct  _Wa__ClientPayload__DNSSource
+struct  Wa__ClientPayload__DNSSource : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_dnsmethod;
   Wa__ClientPayload__DNSSource__DNSResolutionMethod dnsmethod;
   protobuf_c_boolean has_appcached;
@@ -1060,9 +1042,8 @@ struct  _Wa__ClientPayload__DNSSource
     , 0, WA__CLIENT_PAYLOAD__DNSSOURCE__DNSRESOLUTION_METHOD__SYSTEM, 0, 0 }
 
 
-struct  _Wa__ClientPayload__DevicePairingRegistrationData
+struct  Wa__ClientPayload__DevicePairingRegistrationData : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_eregid;
   ProtobufCBinaryData eregid;
   protobuf_c_boolean has_ekeytype;
@@ -1085,9 +1066,8 @@ struct  _Wa__ClientPayload__DevicePairingRegistrationData
     , 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__ClientPayload__UserAgent__AppVersion
+struct  Wa__ClientPayload__UserAgent__AppVersion : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_primary;
   uint32_t primary;
   protobuf_c_boolean has_secondary;
@@ -1104,9 +1084,8 @@ struct  _Wa__ClientPayload__UserAgent__AppVersion
     , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__ClientPayload__UserAgent
+struct  Wa__ClientPayload__UserAgent : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_platform;
   Wa__ClientPayload__UserAgent__Platform platform;
   Wa__ClientPayload__UserAgent__AppVersion *appversion;
@@ -1128,9 +1107,8 @@ struct  _Wa__ClientPayload__UserAgent
     , 0, WA__CLIENT_PAYLOAD__USER_AGENT__PLATFORM__ANDROID, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, WA__CLIENT_PAYLOAD__USER_AGENT__RELEASE_CHANNEL__RELEASE, NULL, NULL, NULL }
 
 
-struct  _Wa__ClientPayload__WebInfo__WebdPayload
+struct  Wa__ClientPayload__WebInfo__WebdPayload : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_usesparticipantinkey;
   protobuf_c_boolean usesparticipantinkey;
   protobuf_c_boolean has_supportsstarredmessages;
@@ -1158,9 +1136,8 @@ struct  _Wa__ClientPayload__WebInfo__WebdPayload
     , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, {0,NULL} }
 
 
-struct  _Wa__ClientPayload__WebInfo
+struct  Wa__ClientPayload__WebInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *reftoken;
   char *version;
   Wa__ClientPayload__WebInfo__WebdPayload *webdpayload;
@@ -1172,9 +1149,8 @@ struct  _Wa__ClientPayload__WebInfo
     , NULL, NULL, NULL, 0, WA__CLIENT_PAYLOAD__WEB_INFO__WEB_SUB_PLATFORM__WEB_BROWSER }
 
 
-struct  _Wa__ClientPayload
+struct  Wa__ClientPayload : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_username;
   uint64_t username;
   protobuf_c_boolean has_passive;
@@ -1224,9 +1200,8 @@ struct  _Wa__ClientPayload
     , 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, WA__CLIENT_PAYLOAD__CONNECT_TYPE__CELLULAR_UNKNOWN, 0, WA__CLIENT_PAYLOAD__CONNECT_REASON__PUSH, 0,NULL, NULL, 0, 0, 0, 0, NULL, 0, WA__CLIENT_PAYLOAD__PRODUCT__WHATSAPP, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, WA__CLIENT_PAYLOAD__IOSAPP_EXTENSION__SHARE_EXTENSION, 0, 0, 0, {0,NULL}, 0, 0, 0, {0,NULL} }
 
 
-struct  _Wa__ContextInfo__AdReplyInfo
+struct  Wa__ContextInfo__AdReplyInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *advertisername;
   protobuf_c_boolean has_mediatype;
   Wa__ContextInfo__AdReplyInfo__MediaType mediatype;
@@ -1239,9 +1214,8 @@ struct  _Wa__ContextInfo__AdReplyInfo
     , NULL, 0, WA__CONTEXT_INFO__AD_REPLY_INFO__MEDIA_TYPE__NONE, 0, {0,NULL}, NULL }
 
 
-struct  _Wa__ContextInfo__ExternalAdReplyInfo
+struct  Wa__ContextInfo__ExternalAdReplyInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *title;
   char *body;
   protobuf_c_boolean has_mediatype;
@@ -1265,9 +1239,8 @@ struct  _Wa__ContextInfo__ExternalAdReplyInfo
     , NULL, NULL, 0, WA__CONTEXT_INFO__EXTERNAL_AD_REPLY_INFO__MEDIA_TYPE__NONE, NULL, NULL, 0, {0,NULL}, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__ContextInfo
+struct  Wa__ContextInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *stanzaid;
   char *participant;
   Wa__Message *quotedmessage;
@@ -1306,9 +1279,8 @@ struct  _Wa__ContextInfo
     , NULL, NULL, NULL, NULL, 0,NULL, NULL, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, {0,NULL}, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL }
 
 
-struct  _Wa__Conversation
+struct  Wa__Conversation : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *id;
   size_t n_messages;
   Wa__HistorySyncMsg **messages;
@@ -1383,9 +1355,8 @@ struct  _Wa__Conversation
     , NULL, 0,NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, WA__CONVERSATION__END_OF_HISTORY_TRANSFER_TYPE__COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY, 0, 0, NULL, NULL, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0,NULL, 0, {0,NULL}, 0, 0, 0, {0,NULL}, 0, 0, 0, 0, NULL, 0, WA__MEDIA_VISIBILITY__DEFAULT, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0 }
 
 
-struct  _Wa__DeviceListMetadata
+struct  Wa__DeviceListMetadata : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_senderkeyhash;
   ProtobufCBinaryData senderkeyhash;
   protobuf_c_boolean has_sendertimestamp;
@@ -1404,9 +1375,8 @@ struct  _Wa__DeviceListMetadata
     , 0, {0,NULL}, 0, 0, 0,NULL, 0, {0,NULL}, 0, 0, 0,NULL }
 
 
-struct  _Wa__DeviceProps__AppVersion
+struct  Wa__DeviceProps__AppVersion : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_primary;
   uint32_t primary;
   protobuf_c_boolean has_secondary;
@@ -1423,9 +1393,8 @@ struct  _Wa__DeviceProps__AppVersion
     , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__DeviceProps
+struct  Wa__DeviceProps : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *os;
   Wa__DeviceProps__AppVersion *version;
   protobuf_c_boolean has_platformtype;
@@ -1438,9 +1407,8 @@ struct  _Wa__DeviceProps
     , NULL, NULL, 0, WA__DEVICE_PROPS__PLATFORM_TYPE__UNKNOWN, 0, 0 }
 
 
-struct  _Wa__DisappearingMode
+struct  Wa__DisappearingMode : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_initiator;
   Wa__DisappearingMode__Initiator initiator;
 };
@@ -1449,9 +1417,8 @@ struct  _Wa__DisappearingMode
     , 0, WA__DISAPPEARING_MODE__INITIATOR__CHANGED_IN_CHAT }
 
 
-struct  _Wa__EphemeralSetting
+struct  Wa__EphemeralSetting : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_duration;
   int32_t duration;
   protobuf_c_boolean has_timestamp;
@@ -1462,9 +1429,8 @@ struct  _Wa__EphemeralSetting
     , 0, 0, 0, 0 }
 
 
-struct  _Wa__ExitCode
+struct  Wa__ExitCode : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_code;
   uint64_t code;
   char *text;
@@ -1474,9 +1440,8 @@ struct  _Wa__ExitCode
     , 0, 0, NULL }
 
 
-struct  _Wa__ExternalBlobReference
+struct  Wa__ExternalBlobReference : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_mediakey;
   ProtobufCBinaryData mediakey;
   char *directpath;
@@ -1493,9 +1458,8 @@ struct  _Wa__ExternalBlobReference
     , 0, {0,NULL}, NULL, NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__GlobalSettings
+struct  Wa__GlobalSettings : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__WallpaperSettings *lightthemewallpaper;
   protobuf_c_boolean has_mediavisibility;
   Wa__MediaVisibility mediavisibility;
@@ -1517,9 +1481,8 @@ struct  _Wa__GlobalSettings
     , NULL, 0, WA__MEDIA_VISIBILITY__DEFAULT, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__GroupParticipant
+struct  Wa__GroupParticipant : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *userjid;
   protobuf_c_boolean has_rank;
   Wa__GroupParticipant__Rank rank;
@@ -1529,9 +1492,8 @@ struct  _Wa__GroupParticipant
     , NULL, 0, WA__GROUP_PARTICIPANT__RANK__REGULAR }
 
 
-struct  _Wa__HandshakeMessage__ClientFinish
+struct  Wa__HandshakeMessage__ClientFinish : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_static_;
   ProtobufCBinaryData static_;
   protobuf_c_boolean has_payload;
@@ -1542,9 +1504,8 @@ struct  _Wa__HandshakeMessage__ClientFinish
     , 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__HandshakeMessage__ClientHello
+struct  Wa__HandshakeMessage__ClientHello : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_ephemeral;
   ProtobufCBinaryData ephemeral;
   protobuf_c_boolean has_static_;
@@ -1557,9 +1518,8 @@ struct  _Wa__HandshakeMessage__ClientHello
     , 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__HandshakeMessage__ServerHello
+struct  Wa__HandshakeMessage__ServerHello : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_ephemeral;
   ProtobufCBinaryData ephemeral;
   protobuf_c_boolean has_static_;
@@ -1572,9 +1532,8 @@ struct  _Wa__HandshakeMessage__ServerHello
     , 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__HandshakeMessage
+struct  Wa__HandshakeMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__HandshakeMessage__ClientHello *clienthello;
   Wa__HandshakeMessage__ServerHello *serverhello;
   Wa__HandshakeMessage__ClientFinish *clientfinish;
@@ -1584,9 +1543,8 @@ struct  _Wa__HandshakeMessage
     , NULL, NULL, NULL }
 
 
-struct  _Wa__HistorySync
+struct  Wa__HistorySync : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__HistorySync__HistorySyncType synctype;
   size_t n_conversations;
   Wa__Conversation **conversations;
@@ -1613,9 +1571,8 @@ struct  _Wa__HistorySync
     , WA__HISTORY_SYNC__HISTORY_SYNC_TYPE__INITIAL_BOOTSTRAP, 0,NULL, 0,NULL, 0, 0, 0, 0, 0,NULL, NULL, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL }
 
 
-struct  _Wa__HistorySyncMsg
+struct  Wa__HistorySyncMsg : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__WebMessageInfo *message;
   protobuf_c_boolean has_msgorderid;
   uint64_t msgorderid;
@@ -1625,9 +1582,8 @@ struct  _Wa__HistorySyncMsg
     , NULL, 0, 0 }
 
 
-struct  _Wa__HydratedTemplateButton__HydratedCallButton
+struct  Wa__HydratedTemplateButton__HydratedCallButton : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *displaytext;
   char *phonenumber;
 };
@@ -1636,9 +1592,8 @@ struct  _Wa__HydratedTemplateButton__HydratedCallButton
     , NULL, NULL }
 
 
-struct  _Wa__HydratedTemplateButton__HydratedQuickReplyButton
+struct  Wa__HydratedTemplateButton__HydratedQuickReplyButton : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *displaytext;
   char *id;
 };
@@ -1647,9 +1602,8 @@ struct  _Wa__HydratedTemplateButton__HydratedQuickReplyButton
     , NULL, NULL }
 
 
-struct  _Wa__HydratedTemplateButton__HydratedURLButton
+struct  Wa__HydratedTemplateButton__HydratedURLButton : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *displaytext;
   char *url;
 };
@@ -1666,9 +1620,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__HYDRATED_TEMPLATE_BUTTON__HYDRATED_BUTTON)
 } Wa__HydratedTemplateButton__HydratedButtonCase;
 
-struct  _Wa__HydratedTemplateButton
+struct  Wa__HydratedTemplateButton : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_index;
   uint32_t index;
   Wa__HydratedTemplateButton__HydratedButtonCase hydrated_button_case;
@@ -1683,9 +1636,8 @@ struct  _Wa__HydratedTemplateButton
     , 0, 0, WA__HYDRATED_TEMPLATE_BUTTON__HYDRATED_BUTTON__NOT_SET, {0} }
 
 
-struct  _Wa__IdentityKeyPairStructure
+struct  Wa__IdentityKeyPairStructure : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_publickey;
   ProtobufCBinaryData publickey;
   protobuf_c_boolean has_privatekey;
@@ -1702,9 +1654,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__INTERACTIVE_ANNOTATION__ACTION)
 } Wa__InteractiveAnnotation__ActionCase;
 
-struct  _Wa__InteractiveAnnotation
+struct  Wa__InteractiveAnnotation : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_polygonvertices;
   Wa__Point **polygonvertices;
   Wa__InteractiveAnnotation__ActionCase action_case;
@@ -1717,9 +1668,8 @@ struct  _Wa__InteractiveAnnotation
     , 0,NULL, WA__INTERACTIVE_ANNOTATION__ACTION__NOT_SET, {0} }
 
 
-struct  _Wa__KeepInChat
+struct  Wa__KeepInChat : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_keeptype;
   Wa__KeepType keeptype;
   protobuf_c_boolean has_servertimestamp;
@@ -1732,9 +1682,8 @@ struct  _Wa__KeepInChat
     , 0, WA__KEEP_TYPE__UNKNOWN, 0, 0, NULL, NULL }
 
 
-struct  _Wa__KeyId
+struct  Wa__KeyId : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_id;
   ProtobufCBinaryData id;
 };
@@ -1743,9 +1692,8 @@ struct  _Wa__KeyId
     , 0, {0,NULL} }
 
 
-struct  _Wa__LocalizedName
+struct  Wa__LocalizedName : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *lg;
   char *lc;
   char *verifiedname;
@@ -1755,9 +1703,8 @@ struct  _Wa__LocalizedName
     , NULL, NULL, NULL }
 
 
-struct  _Wa__Location
+struct  Wa__Location : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_degreeslatitude;
   double degreeslatitude;
   protobuf_c_boolean has_degreeslongitude;
@@ -1769,9 +1716,8 @@ struct  _Wa__Location
     , 0, 0, 0, 0, NULL }
 
 
-struct  _Wa__MediaData
+struct  Wa__MediaData : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *localpath;
 };
 #define WA__MEDIA_DATA__INIT \
@@ -1779,9 +1725,8 @@ struct  _Wa__MediaData
     , NULL }
 
 
-struct  _Wa__MediaRetryNotification
+struct  Wa__MediaRetryNotification : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *stanzaid;
   char *directpath;
   protobuf_c_boolean has_result;
@@ -1792,9 +1737,8 @@ struct  _Wa__MediaRetryNotification
     , NULL, NULL, 0, WA__MEDIA_RETRY_NOTIFICATION__RESULT_TYPE__GENERAL_ERROR }
 
 
-struct  _Wa__Message__AppStateFatalExceptionNotification
+struct  Wa__Message__AppStateFatalExceptionNotification : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_collectionnames;
   char **collectionnames;
   protobuf_c_boolean has_timestamp;
@@ -1805,9 +1749,8 @@ struct  _Wa__Message__AppStateFatalExceptionNotification
     , 0,NULL, 0, 0 }
 
 
-struct  _Wa__Message__AppStateSyncKeyData
+struct  Wa__Message__AppStateSyncKeyData : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_keydata;
   ProtobufCBinaryData keydata;
   Wa__Message__AppStateSyncKeyFingerprint *fingerprint;
@@ -1819,9 +1762,8 @@ struct  _Wa__Message__AppStateSyncKeyData
     , 0, {0,NULL}, NULL, 0, 0 }
 
 
-struct  _Wa__Message__AppStateSyncKeyFingerprint
+struct  Wa__Message__AppStateSyncKeyFingerprint : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_rawid;
   uint32_t rawid;
   protobuf_c_boolean has_currentindex;
@@ -1834,9 +1776,8 @@ struct  _Wa__Message__AppStateSyncKeyFingerprint
     , 0, 0, 0, 0, 0,NULL }
 
 
-struct  _Wa__Message__AppStateSyncKeyId
+struct  Wa__Message__AppStateSyncKeyId : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_keyid;
   ProtobufCBinaryData keyid;
 };
@@ -1845,9 +1786,8 @@ struct  _Wa__Message__AppStateSyncKeyId
     , 0, {0,NULL} }
 
 
-struct  _Wa__Message__AppStateSyncKeyRequest
+struct  Wa__Message__AppStateSyncKeyRequest : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_keyids;
   Wa__Message__AppStateSyncKeyId **keyids;
 };
@@ -1856,9 +1796,8 @@ struct  _Wa__Message__AppStateSyncKeyRequest
     , 0,NULL }
 
 
-struct  _Wa__Message__AppStateSyncKeyShare
+struct  Wa__Message__AppStateSyncKeyShare : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_keys;
   Wa__Message__AppStateSyncKey **keys;
 };
@@ -1867,9 +1806,8 @@ struct  _Wa__Message__AppStateSyncKeyShare
     , 0,NULL }
 
 
-struct  _Wa__Message__AppStateSyncKey
+struct  Wa__Message__AppStateSyncKey : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__AppStateSyncKeyId *keyid;
   Wa__Message__AppStateSyncKeyData *keydata;
 };
@@ -1878,9 +1816,8 @@ struct  _Wa__Message__AppStateSyncKey
     , NULL, NULL }
 
 
-struct  _Wa__Message__AudioMessage
+struct  Wa__Message__AudioMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *url;
   char *mimetype;
   protobuf_c_boolean has_filesha256;
@@ -1909,9 +1846,8 @@ struct  _Wa__Message__AudioMessage
     , NULL, NULL, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, NULL, 0, 0, NULL, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__Message__ButtonsMessage__Button__ButtonText
+struct  Wa__Message__ButtonsMessage__Button__ButtonText : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *displaytext;
 };
 #define WA__MESSAGE__BUTTONS_MESSAGE__BUTTON__BUTTON_TEXT__INIT \
@@ -1919,9 +1855,8 @@ struct  _Wa__Message__ButtonsMessage__Button__ButtonText
     , NULL }
 
 
-struct  _Wa__Message__ButtonsMessage__Button__NativeFlowInfo
+struct  Wa__Message__ButtonsMessage__Button__NativeFlowInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *name;
   char *paramsjson;
 };
@@ -1930,9 +1865,8 @@ struct  _Wa__Message__ButtonsMessage__Button__NativeFlowInfo
     , NULL, NULL }
 
 
-struct  _Wa__Message__ButtonsMessage__Button
+struct  Wa__Message__ButtonsMessage__Button : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *buttonid;
   Wa__Message__ButtonsMessage__Button__ButtonText *buttontext;
   protobuf_c_boolean has_type;
@@ -1954,9 +1888,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__BUTTONS_MESSAGE__HEADER)
 } Wa__Message__ButtonsMessage__HeaderCase;
 
-struct  _Wa__Message__ButtonsMessage
+struct  Wa__Message__ButtonsMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *contenttext;
   char *footertext;
   Wa__ContextInfo *contextinfo;
@@ -1984,9 +1917,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__BUTTONS_RESPONSE_MESSAGE__RESPONSE)
 } Wa__Message__ButtonsResponseMessage__ResponseCase;
 
-struct  _Wa__Message__ButtonsResponseMessage
+struct  Wa__Message__ButtonsResponseMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *selectedbuttonid;
   Wa__ContextInfo *contextinfo;
   protobuf_c_boolean has_type;
@@ -2001,9 +1933,8 @@ struct  _Wa__Message__ButtonsResponseMessage
     , NULL, NULL, 0, WA__MESSAGE__BUTTONS_RESPONSE_MESSAGE__TYPE__UNKNOWN, WA__MESSAGE__BUTTONS_RESPONSE_MESSAGE__RESPONSE__NOT_SET, {0} }
 
 
-struct  _Wa__Message__Call
+struct  Wa__Message__Call : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_callkey;
   ProtobufCBinaryData callkey;
   char *conversionsource;
@@ -2017,9 +1948,8 @@ struct  _Wa__Message__Call
     , 0, {0,NULL}, NULL, 0, {0,NULL}, 0, 0 }
 
 
-struct  _Wa__Message__CancelPaymentRequestMessage
+struct  Wa__Message__CancelPaymentRequestMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *key;
 };
 #define WA__MESSAGE__CANCEL_PAYMENT_REQUEST_MESSAGE__INIT \
@@ -2027,9 +1957,8 @@ struct  _Wa__Message__CancelPaymentRequestMessage
     , NULL }
 
 
-struct  _Wa__Message__Chat
+struct  Wa__Message__Chat : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *displayname;
   char *id;
 };
@@ -2038,9 +1967,8 @@ struct  _Wa__Message__Chat
     , NULL, NULL }
 
 
-struct  _Wa__Message__ContactMessage
+struct  Wa__Message__ContactMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *displayname;
   char *vcard;
   Wa__ContextInfo *contextinfo;
@@ -2050,9 +1978,8 @@ struct  _Wa__Message__ContactMessage
     , NULL, NULL, NULL }
 
 
-struct  _Wa__Message__ContactsArrayMessage
+struct  Wa__Message__ContactsArrayMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *displayname;
   size_t n_contacts;
   Wa__Message__ContactMessage **contacts;
@@ -2063,9 +1990,8 @@ struct  _Wa__Message__ContactsArrayMessage
     , NULL, 0,NULL, NULL }
 
 
-struct  _Wa__Message__DeclinePaymentRequestMessage
+struct  Wa__Message__DeclinePaymentRequestMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *key;
 };
 #define WA__MESSAGE__DECLINE_PAYMENT_REQUEST_MESSAGE__INIT \
@@ -2073,9 +1999,8 @@ struct  _Wa__Message__DeclinePaymentRequestMessage
     , NULL }
 
 
-struct  _Wa__Message__DeviceSentMessage
+struct  Wa__Message__DeviceSentMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *destinationjid;
   Wa__Message *message;
   char *phash;
@@ -2085,9 +2010,8 @@ struct  _Wa__Message__DeviceSentMessage
     , NULL, NULL, NULL }
 
 
-struct  _Wa__Message__DocumentMessage
+struct  Wa__Message__DocumentMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *url;
   char *mimetype;
   char *title;
@@ -2126,9 +2050,8 @@ struct  _Wa__Message__DocumentMessage
     , NULL, NULL, NULL, 0, {0,NULL}, 0, 0, 0, 0, 0, {0,NULL}, NULL, 0, {0,NULL}, NULL, 0, 0, 0, 0, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, NULL, 0, 0, 0, 0, NULL }
 
 
-struct  _Wa__Message__ExtendedTextMessage
+struct  Wa__Message__ExtendedTextMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *text;
   char *matchedtext;
   char *canonicalurl;
@@ -2173,9 +2096,8 @@ struct  _Wa__Message__ExtendedTextMessage
     , NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, WA__MESSAGE__EXTENDED_TEXT_MESSAGE__FONT_TYPE__SANS_SERIF, 0, WA__MESSAGE__EXTENDED_TEXT_MESSAGE__PREVIEW_TYPE__NONE, 0, {0,NULL}, NULL, 0, 0, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0, WA__MESSAGE__EXTENDED_TEXT_MESSAGE__INVITE_LINK_GROUP_TYPE__DEFAULT, NULL, 0, {0,NULL}, 0, WA__MESSAGE__EXTENDED_TEXT_MESSAGE__INVITE_LINK_GROUP_TYPE__DEFAULT }
 
 
-struct  _Wa__Message__FutureProofMessage
+struct  Wa__Message__FutureProofMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message *message;
 };
 #define WA__MESSAGE__FUTURE_PROOF_MESSAGE__INIT \
@@ -2183,9 +2105,8 @@ struct  _Wa__Message__FutureProofMessage
     , NULL }
 
 
-struct  _Wa__Message__GroupInviteMessage
+struct  Wa__Message__GroupInviteMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *groupjid;
   char *invitecode;
   protobuf_c_boolean has_inviteexpiration;
@@ -2203,9 +2124,8 @@ struct  _Wa__Message__GroupInviteMessage
     , NULL, NULL, 0, 0, NULL, 0, {0,NULL}, NULL, NULL, 0, WA__MESSAGE__GROUP_INVITE_MESSAGE__GROUP_TYPE__DEFAULT }
 
 
-struct  _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMCurrency
+struct  Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMCurrency : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *currencycode;
   protobuf_c_boolean has_amount1000;
   int64_t amount1000;
@@ -2215,9 +2135,8 @@ struct  _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMCurre
     , NULL, 0, 0 }
 
 
-struct  _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeComponent
+struct  Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeComponent : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_dayofweek;
   Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeComponent__DayOfWeekType dayofweek;
   protobuf_c_boolean has_year;
@@ -2238,9 +2157,8 @@ struct  _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateT
     , 0, WA__MESSAGE__HIGHLY_STRUCTURED_MESSAGE__HSMLOCALIZABLE_PARAMETER__HSMDATE_TIME__HSMDATE_TIME_COMPONENT__DAY_OF_WEEK_TYPE__MONDAY, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, WA__MESSAGE__HIGHLY_STRUCTURED_MESSAGE__HSMLOCALIZABLE_PARAMETER__HSMDATE_TIME__HSMDATE_TIME_COMPONENT__CALENDAR_TYPE__GREGORIAN }
 
 
-struct  _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeUnixEpoch
+struct  Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeUnixEpoch : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_timestamp;
   int64_t timestamp;
 };
@@ -2256,9 +2174,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__HIGHLY_STRUCTURED_MESSAGE__HSMLOCALIZABLE_PARAMETER__HSMDATE_TIME__DATETIME_ONEOF)
 } Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__DatetimeOneofCase;
 
-struct  _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime
+struct  Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__DatetimeOneofCase datetime_oneof_case;
   union {
     Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__HSMDateTime__HSMDateTimeComponent *component;
@@ -2277,9 +2194,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__HIGHLY_STRUCTURED_MESSAGE__HSMLOCALIZABLE_PARAMETER__PARAM_ONEOF)
 } Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__ParamOneofCase;
 
-struct  _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter
+struct  Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *default_;
   Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter__ParamOneofCase param_oneof_case;
   union {
@@ -2292,9 +2208,8 @@ struct  _Wa__Message__HighlyStructuredMessage__HSMLocalizableParameter
     , NULL, WA__MESSAGE__HIGHLY_STRUCTURED_MESSAGE__HSMLOCALIZABLE_PARAMETER__PARAM_ONEOF__NOT_SET, {0} }
 
 
-struct  _Wa__Message__HighlyStructuredMessage
+struct  Wa__Message__HighlyStructuredMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *namespace_;
   char *elementname;
   size_t n_params;
@@ -2312,9 +2227,8 @@ struct  _Wa__Message__HighlyStructuredMessage
     , NULL, NULL, 0,NULL, NULL, NULL, 0,NULL, NULL, NULL, NULL }
 
 
-struct  _Wa__Message__HistorySyncNotification
+struct  Wa__Message__HistorySyncNotification : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_filesha256;
   ProtobufCBinaryData filesha256;
   protobuf_c_boolean has_filelength;
@@ -2337,9 +2251,8 @@ struct  _Wa__Message__HistorySyncNotification
     , 0, {0,NULL}, 0, 0, 0, {0,NULL}, 0, {0,NULL}, NULL, 0, WA__MESSAGE__HISTORY_SYNC_NOTIFICATION__HISTORY_SYNC_TYPE__INITIAL_BOOTSTRAP, 0, 0, NULL, 0, 0 }
 
 
-struct  _Wa__Message__ImageMessage
+struct  Wa__Message__ImageMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *url;
   char *mimetype;
   char *caption;
@@ -2391,9 +2304,8 @@ struct  _Wa__Message__ImageMessage
     , NULL, NULL, NULL, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0,NULL, NULL, 0, 0, 0, {0,NULL}, NULL, 0, {0,NULL}, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, NULL, 0, {0,NULL}, 0, {0,NULL}, NULL }
 
 
-struct  _Wa__Message__InitialSecurityNotificationSettingSync
+struct  Wa__Message__InitialSecurityNotificationSettingSync : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_securitynotificationenabled;
   protobuf_c_boolean securitynotificationenabled;
 };
@@ -2402,9 +2314,8 @@ struct  _Wa__Message__InitialSecurityNotificationSettingSync
     , 0, 0 }
 
 
-struct  _Wa__Message__InteractiveMessage__Body
+struct  Wa__Message__InteractiveMessage__Body : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *text;
 };
 #define WA__MESSAGE__INTERACTIVE_MESSAGE__BODY__INIT \
@@ -2412,9 +2323,8 @@ struct  _Wa__Message__InteractiveMessage__Body
     , NULL }
 
 
-struct  _Wa__Message__InteractiveMessage__CollectionMessage
+struct  Wa__Message__InteractiveMessage__CollectionMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *bizjid;
   char *id;
   protobuf_c_boolean has_messageversion;
@@ -2425,9 +2335,8 @@ struct  _Wa__Message__InteractiveMessage__CollectionMessage
     , NULL, NULL, 0, 0 }
 
 
-struct  _Wa__Message__InteractiveMessage__Footer
+struct  Wa__Message__InteractiveMessage__Footer : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *text;
 };
 #define WA__MESSAGE__INTERACTIVE_MESSAGE__FOOTER__INIT \
@@ -2444,9 +2353,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__INTERACTIVE_MESSAGE__HEADER__MEDIA)
 } Wa__Message__InteractiveMessage__Header__MediaCase;
 
-struct  _Wa__Message__InteractiveMessage__Header
+struct  Wa__Message__InteractiveMessage__Header : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *title;
   char *subtitle;
   protobuf_c_boolean has_hasmediaattachment;
@@ -2464,9 +2372,8 @@ struct  _Wa__Message__InteractiveMessage__Header
     , NULL, NULL, 0, 0, WA__MESSAGE__INTERACTIVE_MESSAGE__HEADER__MEDIA__NOT_SET, {0} }
 
 
-struct  _Wa__Message__InteractiveMessage__NativeFlowMessage__NativeFlowButton
+struct  Wa__Message__InteractiveMessage__NativeFlowMessage__NativeFlowButton : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *name;
   char *buttonparamsjson;
 };
@@ -2475,9 +2382,8 @@ struct  _Wa__Message__InteractiveMessage__NativeFlowMessage__NativeFlowButton
     , NULL, NULL }
 
 
-struct  _Wa__Message__InteractiveMessage__NativeFlowMessage
+struct  Wa__Message__InteractiveMessage__NativeFlowMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_buttons;
   Wa__Message__InteractiveMessage__NativeFlowMessage__NativeFlowButton **buttons;
   char *messageparamsjson;
@@ -2489,9 +2395,8 @@ struct  _Wa__Message__InteractiveMessage__NativeFlowMessage
     , 0,NULL, NULL, 0, 0 }
 
 
-struct  _Wa__Message__InteractiveMessage__ShopMessage
+struct  Wa__Message__InteractiveMessage__ShopMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *id;
   protobuf_c_boolean has_surface;
   Wa__Message__InteractiveMessage__ShopMessage__Surface surface;
@@ -2511,9 +2416,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__INTERACTIVE_MESSAGE__INTERACTIVE_MESSAGE)
 } Wa__Message__InteractiveMessage__InteractiveMessageCase;
 
-struct  _Wa__Message__InteractiveMessage
+struct  Wa__Message__InteractiveMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__InteractiveMessage__Header *header;
   Wa__Message__InteractiveMessage__Body *body;
   Wa__Message__InteractiveMessage__Footer *footer;
@@ -2530,9 +2434,8 @@ struct  _Wa__Message__InteractiveMessage
     , NULL, NULL, NULL, NULL, WA__MESSAGE__INTERACTIVE_MESSAGE__INTERACTIVE_MESSAGE__NOT_SET, {0} }
 
 
-struct  _Wa__Message__InteractiveResponseMessage__Body
+struct  Wa__Message__InteractiveResponseMessage__Body : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *text;
 };
 #define WA__MESSAGE__INTERACTIVE_RESPONSE_MESSAGE__BODY__INIT \
@@ -2540,9 +2443,8 @@ struct  _Wa__Message__InteractiveResponseMessage__Body
     , NULL }
 
 
-struct  _Wa__Message__InteractiveResponseMessage__NativeFlowResponseMessage
+struct  Wa__Message__InteractiveResponseMessage__NativeFlowResponseMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *name;
   char *paramsjson;
   protobuf_c_boolean has_version;
@@ -2559,9 +2461,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__INTERACTIVE_RESPONSE_MESSAGE__INTERACTIVE_RESPONSE_MESSAGE)
 } Wa__Message__InteractiveResponseMessage__InteractiveResponseMessageCase;
 
-struct  _Wa__Message__InteractiveResponseMessage
+struct  Wa__Message__InteractiveResponseMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__InteractiveResponseMessage__Body *body;
   Wa__ContextInfo *contextinfo;
   Wa__Message__InteractiveResponseMessage__InteractiveResponseMessageCase interactive_response_message_case;
@@ -2574,9 +2475,8 @@ struct  _Wa__Message__InteractiveResponseMessage
     , NULL, NULL, WA__MESSAGE__INTERACTIVE_RESPONSE_MESSAGE__INTERACTIVE_RESPONSE_MESSAGE__NOT_SET, {0} }
 
 
-struct  _Wa__Message__InvoiceMessage
+struct  Wa__Message__InvoiceMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *note;
   char *token;
   protobuf_c_boolean has_attachmenttype;
@@ -2599,9 +2499,8 @@ struct  _Wa__Message__InvoiceMessage
     , NULL, NULL, 0, WA__MESSAGE__INVOICE_MESSAGE__ATTACHMENT_TYPE__IMAGE, NULL, 0, {0,NULL}, 0, 0, 0, {0,NULL}, 0, {0,NULL}, NULL, 0, {0,NULL} }
 
 
-struct  _Wa__Message__KeepInChatMessage
+struct  Wa__Message__KeepInChatMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *key;
   protobuf_c_boolean has_keeptype;
   Wa__KeepType keeptype;
@@ -2613,9 +2512,8 @@ struct  _Wa__Message__KeepInChatMessage
     , NULL, 0, WA__KEEP_TYPE__UNKNOWN, 0, 0 }
 
 
-struct  _Wa__Message__ListMessage__ProductListHeaderImage
+struct  Wa__Message__ListMessage__ProductListHeaderImage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *productid;
   protobuf_c_boolean has_jpegthumbnail;
   ProtobufCBinaryData jpegthumbnail;
@@ -2625,9 +2523,8 @@ struct  _Wa__Message__ListMessage__ProductListHeaderImage
     , NULL, 0, {0,NULL} }
 
 
-struct  _Wa__Message__ListMessage__ProductListInfo
+struct  Wa__Message__ListMessage__ProductListInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_productsections;
   Wa__Message__ListMessage__ProductSection **productsections;
   Wa__Message__ListMessage__ProductListHeaderImage *headerimage;
@@ -2638,9 +2535,8 @@ struct  _Wa__Message__ListMessage__ProductListInfo
     , 0,NULL, NULL, NULL }
 
 
-struct  _Wa__Message__ListMessage__ProductSection
+struct  Wa__Message__ListMessage__ProductSection : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *title;
   size_t n_products;
   Wa__Message__ListMessage__Product **products;
@@ -2650,9 +2546,8 @@ struct  _Wa__Message__ListMessage__ProductSection
     , NULL, 0,NULL }
 
 
-struct  _Wa__Message__ListMessage__Product
+struct  Wa__Message__ListMessage__Product : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *productid;
 };
 #define WA__MESSAGE__LIST_MESSAGE__PRODUCT__INIT \
@@ -2660,9 +2555,8 @@ struct  _Wa__Message__ListMessage__Product
     , NULL }
 
 
-struct  _Wa__Message__ListMessage__Row
+struct  Wa__Message__ListMessage__Row : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *title;
   char *description;
   char *rowid;
@@ -2672,9 +2566,8 @@ struct  _Wa__Message__ListMessage__Row
     , NULL, NULL, NULL }
 
 
-struct  _Wa__Message__ListMessage__Section
+struct  Wa__Message__ListMessage__Section : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *title;
   size_t n_rows;
   Wa__Message__ListMessage__Row **rows;
@@ -2684,9 +2577,8 @@ struct  _Wa__Message__ListMessage__Section
     , NULL, 0,NULL }
 
 
-struct  _Wa__Message__ListMessage
+struct  Wa__Message__ListMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *title;
   char *description;
   char *buttontext;
@@ -2703,9 +2595,8 @@ struct  _Wa__Message__ListMessage
     , NULL, NULL, NULL, 0, WA__MESSAGE__LIST_MESSAGE__LIST_TYPE__UNKNOWN, 0,NULL, NULL, NULL, NULL }
 
 
-struct  _Wa__Message__ListResponseMessage__SingleSelectReply
+struct  Wa__Message__ListResponseMessage__SingleSelectReply : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *selectedrowid;
 };
 #define WA__MESSAGE__LIST_RESPONSE_MESSAGE__SINGLE_SELECT_REPLY__INIT \
@@ -2713,9 +2604,8 @@ struct  _Wa__Message__ListResponseMessage__SingleSelectReply
     , NULL }
 
 
-struct  _Wa__Message__ListResponseMessage
+struct  Wa__Message__ListResponseMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *title;
   protobuf_c_boolean has_listtype;
   Wa__Message__ListResponseMessage__ListType listtype;
@@ -2728,9 +2618,8 @@ struct  _Wa__Message__ListResponseMessage
     , NULL, 0, WA__MESSAGE__LIST_RESPONSE_MESSAGE__LIST_TYPE__UNKNOWN, NULL, NULL, NULL }
 
 
-struct  _Wa__Message__LiveLocationMessage
+struct  Wa__Message__LiveLocationMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_degreeslatitude;
   double degreeslatitude;
   protobuf_c_boolean has_degreeslongitude;
@@ -2755,9 +2644,8 @@ struct  _Wa__Message__LiveLocationMessage
     , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, {0,NULL}, NULL }
 
 
-struct  _Wa__Message__LocationMessage
+struct  Wa__Message__LocationMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_degreeslatitude;
   double degreeslatitude;
   protobuf_c_boolean has_degreeslongitude;
@@ -2783,9 +2671,8 @@ struct  _Wa__Message__LocationMessage
     , 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, {0,NULL}, NULL }
 
 
-struct  _Wa__Message__OrderMessage
+struct  Wa__Message__OrderMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *orderid;
   protobuf_c_boolean has_thumbnail;
   ProtobufCBinaryData thumbnail;
@@ -2809,9 +2696,8 @@ struct  _Wa__Message__OrderMessage
     , NULL, 0, {0,NULL}, 0, 0, 0, WA__MESSAGE__ORDER_MESSAGE__ORDER_STATUS__INQUIRY, 0, WA__MESSAGE__ORDER_MESSAGE__ORDER_SURFACE__CATALOG, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL }
 
 
-struct  _Wa__Message__PaymentInviteMessage
+struct  Wa__Message__PaymentInviteMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_servicetype;
   Wa__Message__PaymentInviteMessage__ServiceType servicetype;
   protobuf_c_boolean has_expirytimestamp;
@@ -2822,9 +2708,8 @@ struct  _Wa__Message__PaymentInviteMessage
     , 0, WA__MESSAGE__PAYMENT_INVITE_MESSAGE__SERVICE_TYPE__UNKNOWN, 0, 0 }
 
 
-struct  _Wa__Message__PollCreationMessage__Option
+struct  Wa__Message__PollCreationMessage__Option : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *optionname;
 };
 #define WA__MESSAGE__POLL_CREATION_MESSAGE__OPTION__INIT \
@@ -2832,9 +2717,8 @@ struct  _Wa__Message__PollCreationMessage__Option
     , NULL }
 
 
-struct  _Wa__Message__PollCreationMessage
+struct  Wa__Message__PollCreationMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_enckey;
   ProtobufCBinaryData enckey;
   char *name;
@@ -2849,9 +2733,8 @@ struct  _Wa__Message__PollCreationMessage
     , 0, {0,NULL}, NULL, 0,NULL, 0, 0, NULL }
 
 
-struct  _Wa__Message__PollEncValue
+struct  Wa__Message__PollEncValue : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_encpayload;
   ProtobufCBinaryData encpayload;
   protobuf_c_boolean has_enciv;
@@ -2862,18 +2745,16 @@ struct  _Wa__Message__PollEncValue
     , 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__Message__PollUpdateMessageMetadata
+struct  Wa__Message__PollUpdateMessageMetadata : public ProtobufCMessage
 {
-  ProtobufCMessage base;
 };
 #define WA__MESSAGE__POLL_UPDATE_MESSAGE_METADATA__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&wa__message__poll_update_message_metadata__descriptor) \
      }
 
 
-struct  _Wa__Message__PollUpdateMessage
+struct  Wa__Message__PollUpdateMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *pollcreationmessagekey;
   Wa__Message__PollEncValue *vote;
   Wa__Message__PollUpdateMessageMetadata *metadata;
@@ -2885,9 +2766,8 @@ struct  _Wa__Message__PollUpdateMessage
     , NULL, NULL, NULL, 0, 0 }
 
 
-struct  _Wa__Message__PollVoteMessage
+struct  Wa__Message__PollVoteMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_selectedoptions;
   ProtobufCBinaryData *selectedoptions;
 };
@@ -2896,9 +2776,8 @@ struct  _Wa__Message__PollVoteMessage
     , 0,NULL }
 
 
-struct  _Wa__Message__ProductMessage__CatalogSnapshot
+struct  Wa__Message__ProductMessage__CatalogSnapshot : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__ImageMessage *catalogimage;
   char *title;
   char *description;
@@ -2908,9 +2787,8 @@ struct  _Wa__Message__ProductMessage__CatalogSnapshot
     , NULL, NULL, NULL }
 
 
-struct  _Wa__Message__ProductMessage__ProductSnapshot
+struct  Wa__Message__ProductMessage__ProductSnapshot : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__ImageMessage *productimage;
   char *productid;
   char *title;
@@ -2931,9 +2809,8 @@ struct  _Wa__Message__ProductMessage__ProductSnapshot
     , NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, 0, 0, NULL, 0, 0 }
 
 
-struct  _Wa__Message__ProductMessage
+struct  Wa__Message__ProductMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__ProductMessage__ProductSnapshot *product;
   char *businessownerjid;
   Wa__Message__ProductMessage__CatalogSnapshot *catalog;
@@ -2946,9 +2823,8 @@ struct  _Wa__Message__ProductMessage
     , NULL, NULL, NULL, NULL, NULL, NULL }
 
 
-struct  _Wa__Message__ProtocolMessage
+struct  Wa__Message__ProtocolMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *key;
   protobuf_c_boolean has_type;
   Wa__Message__ProtocolMessage__Type type;
@@ -2970,9 +2846,8 @@ struct  _Wa__Message__ProtocolMessage
     , NULL, 0, WA__MESSAGE__PROTOCOL_MESSAGE__TYPE__REVOKE, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 
 
-struct  _Wa__Message__ReactionMessage
+struct  Wa__Message__ReactionMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *key;
   char *text;
   char *groupingkey;
@@ -2984,9 +2859,8 @@ struct  _Wa__Message__ReactionMessage
     , NULL, NULL, NULL, 0, 0 }
 
 
-struct  _Wa__Message__RequestMediaUploadMessage
+struct  Wa__Message__RequestMediaUploadMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_filesha256;
   char **filesha256;
   protobuf_c_boolean has_rmrsource;
@@ -2997,9 +2871,8 @@ struct  _Wa__Message__RequestMediaUploadMessage
     , 0,NULL, 0, WA__MESSAGE__RMR_SOURCE__FAVORITE_STICKER }
 
 
-struct  _Wa__Message__RequestMediaUploadResponseMessage__RequestMediaUploadResult
+struct  Wa__Message__RequestMediaUploadResponseMessage__RequestMediaUploadResult : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *filesha256;
   protobuf_c_boolean has_mediauploadresult;
   Wa__MediaRetryNotification__ResultType mediauploadresult;
@@ -3010,9 +2883,8 @@ struct  _Wa__Message__RequestMediaUploadResponseMessage__RequestMediaUploadResul
     , NULL, 0, WA__MEDIA_RETRY_NOTIFICATION__RESULT_TYPE__GENERAL_ERROR, NULL }
 
 
-struct  _Wa__Message__RequestMediaUploadResponseMessage
+struct  Wa__Message__RequestMediaUploadResponseMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_rmrsource;
   Wa__Message__RmrSource rmrsource;
   char *stanzaid;
@@ -3024,9 +2896,8 @@ struct  _Wa__Message__RequestMediaUploadResponseMessage
     , 0, WA__MESSAGE__RMR_SOURCE__FAVORITE_STICKER, NULL, 0,NULL }
 
 
-struct  _Wa__Message__RequestPaymentMessage
+struct  Wa__Message__RequestPaymentMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message *notemessage;
   char *currencycodeiso4217;
   protobuf_c_boolean has_amount1000;
@@ -3042,9 +2913,8 @@ struct  _Wa__Message__RequestPaymentMessage
     , NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL }
 
 
-struct  _Wa__Message__RequestPhoneNumberMessage
+struct  Wa__Message__RequestPhoneNumberMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__ContextInfo *contextinfo;
 };
 #define WA__MESSAGE__REQUEST_PHONE_NUMBER_MESSAGE__INIT \
@@ -3052,9 +2922,8 @@ struct  _Wa__Message__RequestPhoneNumberMessage
     , NULL }
 
 
-struct  _Wa__Message__SendPaymentMessage
+struct  Wa__Message__SendPaymentMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message *notemessage;
   Wa__MessageKey *requestmessagekey;
   Wa__PaymentBackground *background;
@@ -3064,9 +2933,8 @@ struct  _Wa__Message__SendPaymentMessage
     , NULL, NULL, NULL }
 
 
-struct  _Wa__Message__SenderKeyDistributionMessage
+struct  Wa__Message__SenderKeyDistributionMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *groupid;
   protobuf_c_boolean has_axolotlsenderkeydistributionmessage;
   ProtobufCBinaryData axolotlsenderkeydistributionmessage;
@@ -3076,9 +2944,8 @@ struct  _Wa__Message__SenderKeyDistributionMessage
     , NULL, 0, {0,NULL} }
 
 
-struct  _Wa__Message__StickerMessage
+struct  Wa__Message__StickerMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *url;
   protobuf_c_boolean has_filesha256;
   ProtobufCBinaryData filesha256;
@@ -3111,9 +2978,8 @@ struct  _Wa__Message__StickerMessage
     , NULL, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, NULL, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0, {0,NULL}, NULL }
 
 
-struct  _Wa__Message__StickerSyncRMRMessage
+struct  Wa__Message__StickerSyncRMRMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_filehash;
   char **filehash;
   char *rmrsource;
@@ -3125,9 +2991,8 @@ struct  _Wa__Message__StickerSyncRMRMessage
     , 0,NULL, NULL, 0, 0 }
 
 
-struct  _Wa__Message__TemplateButtonReplyMessage
+struct  Wa__Message__TemplateButtonReplyMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *selectedid;
   char *selecteddisplaytext;
   Wa__ContextInfo *contextinfo;
@@ -3149,9 +3014,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__TEMPLATE_MESSAGE__FOUR_ROW_TEMPLATE__TITLE)
 } Wa__Message__TemplateMessage__FourRowTemplate__TitleCase;
 
-struct  _Wa__Message__TemplateMessage__FourRowTemplate
+struct  Wa__Message__TemplateMessage__FourRowTemplate : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__HighlyStructuredMessage *content;
   Wa__Message__HighlyStructuredMessage *footer;
   size_t n_buttons;
@@ -3180,9 +3044,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__TEMPLATE_MESSAGE__HYDRATED_FOUR_ROW_TEMPLATE__TITLE)
 } Wa__Message__TemplateMessage__HydratedFourRowTemplate__TitleCase;
 
-struct  _Wa__Message__TemplateMessage__HydratedFourRowTemplate
+struct  Wa__Message__TemplateMessage__HydratedFourRowTemplate : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *hydratedcontenttext;
   char *hydratedfootertext;
   size_t n_hydratedbuttons;
@@ -3209,9 +3072,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__MESSAGE__TEMPLATE_MESSAGE__FORMAT)
 } Wa__Message__TemplateMessage__FormatCase;
 
-struct  _Wa__Message__TemplateMessage
+struct  Wa__Message__TemplateMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__ContextInfo *contextinfo;
   Wa__Message__TemplateMessage__HydratedFourRowTemplate *hydratedtemplate;
   Wa__Message__TemplateMessage__FormatCase format_case;
@@ -3225,9 +3087,8 @@ struct  _Wa__Message__TemplateMessage
     , NULL, NULL, WA__MESSAGE__TEMPLATE_MESSAGE__FORMAT__NOT_SET, {0} }
 
 
-struct  _Wa__Message__VideoMessage
+struct  Wa__Message__VideoMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *url;
   char *mimetype;
   protobuf_c_boolean has_filesha256;
@@ -3273,9 +3134,8 @@ struct  _Wa__Message__VideoMessage
     , NULL, NULL, 0, {0,NULL}, 0, 0, 0, 0, 0, {0,NULL}, NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, NULL, 0, 0, 0, {0,NULL}, NULL, 0, {0,NULL}, 0, WA__MESSAGE__VIDEO_MESSAGE__ATTRIBUTION__NONE, 0, 0, NULL, 0, {0,NULL}, 0, {0,NULL}, NULL }
 
 
-struct  _Wa__Message
+struct  Wa__Message : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *conversation;
   Wa__Message__SenderKeyDistributionMessage *senderkeydistributionmessage;
   Wa__Message__ImageMessage *imagemessage;
@@ -3328,9 +3188,8 @@ struct  _Wa__Message
     , NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 
 
-struct  _Wa__MessageContextInfo
+struct  Wa__MessageContextInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__DeviceListMetadata *devicelistmetadata;
   protobuf_c_boolean has_devicelistmetadataversion;
   int32_t devicelistmetadataversion;
@@ -3344,9 +3203,8 @@ struct  _Wa__MessageContextInfo
     , NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__MessageKey
+struct  Wa__MessageKey : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *remotejid;
   protobuf_c_boolean has_fromme;
   protobuf_c_boolean fromme;
@@ -3358,9 +3216,8 @@ struct  _Wa__MessageKey
     , NULL, 0, 0, NULL, NULL }
 
 
-struct  _Wa__Money
+struct  Wa__Money : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_value;
   int64_t value;
   protobuf_c_boolean has_offset;
@@ -3372,9 +3229,8 @@ struct  _Wa__Money
     , 0, 0, 0, 0, NULL }
 
 
-struct  _Wa__MsgOpaqueData__PollOption
+struct  Wa__MsgOpaqueData__PollOption : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *name;
 };
 #define WA__MSG_OPAQUE_DATA__POLL_OPTION__INIT \
@@ -3382,9 +3238,8 @@ struct  _Wa__MsgOpaqueData__PollOption
     , NULL }
 
 
-struct  _Wa__MsgOpaqueData
+struct  Wa__MsgOpaqueData : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *body;
   char *caption;
   protobuf_c_boolean has_lng;
@@ -3421,9 +3276,8 @@ struct  _Wa__MsgOpaqueData
     , NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, {0,NULL}, NULL, NULL, NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, 0, NULL, NULL }
 
 
-struct  _Wa__MsgRowOpaqueData
+struct  Wa__MsgRowOpaqueData : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MsgOpaqueData *currentmsg;
   Wa__MsgOpaqueData *quotedmsg;
 };
@@ -3432,9 +3286,8 @@ struct  _Wa__MsgRowOpaqueData
     , NULL, NULL }
 
 
-struct  _Wa__NoiseCertificate__Details
+struct  Wa__NoiseCertificate__Details : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_serial;
   uint32_t serial;
   char *issuer;
@@ -3449,9 +3302,8 @@ struct  _Wa__NoiseCertificate__Details
     , 0, 0, NULL, 0, 0, NULL, 0, {0,NULL} }
 
 
-struct  _Wa__NoiseCertificate
+struct  Wa__NoiseCertificate : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_details;
   ProtobufCBinaryData details;
   protobuf_c_boolean has_signature;
@@ -3462,9 +3314,8 @@ struct  _Wa__NoiseCertificate
     , 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__NotificationMessageInfo
+struct  Wa__NotificationMessageInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *key;
   Wa__Message *message;
   protobuf_c_boolean has_messagetimestamp;
@@ -3476,9 +3327,8 @@ struct  _Wa__NotificationMessageInfo
     , NULL, NULL, 0, 0, NULL }
 
 
-struct  _Wa__PastParticipant
+struct  Wa__PastParticipant : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *userjid;
   Wa__PastParticipant__LeaveReason leavereason;
   uint64_t leavets;
@@ -3488,9 +3338,8 @@ struct  _Wa__PastParticipant
     , NULL, WA__PAST_PARTICIPANT__LEAVE_REASON__LEFT, 0 }
 
 
-struct  _Wa__PastParticipants
+struct  Wa__PastParticipants : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *groupjid;
   size_t n_pastparticipants;
   Wa__PastParticipant **pastparticipants;
@@ -3500,9 +3349,8 @@ struct  _Wa__PastParticipants
     , NULL, 0,NULL }
 
 
-struct  _Wa__PaymentBackground__MediaData
+struct  Wa__PaymentBackground__MediaData : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_mediakey;
   ProtobufCBinaryData mediakey;
   protobuf_c_boolean has_mediakeytimestamp;
@@ -3518,9 +3366,8 @@ struct  _Wa__PaymentBackground__MediaData
     , 0, {0,NULL}, 0, 0, 0, {0,NULL}, 0, {0,NULL}, NULL }
 
 
-struct  _Wa__PaymentBackground
+struct  Wa__PaymentBackground : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *id;
   protobuf_c_boolean has_filelength;
   uint64_t filelength;
@@ -3544,9 +3391,8 @@ struct  _Wa__PaymentBackground
     , NULL, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, NULL, 0, WA__PAYMENT_BACKGROUND__TYPE__UNKNOWN }
 
 
-struct  _Wa__PaymentInfo
+struct  Wa__PaymentInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_currencydeprecated;
   Wa__PaymentInfo__Currency currencydeprecated;
   protobuf_c_boolean has_amount1000;
@@ -3574,9 +3420,8 @@ struct  _Wa__PaymentInfo
     , 0, WA__PAYMENT_INFO__CURRENCY__UNKNOWN_CURRENCY, 0, 0, NULL, 0, WA__PAYMENT_INFO__STATUS__UNKNOWN_STATUS, 0, 0, NULL, 0, 0, 0, 0, NULL, 0, WA__PAYMENT_INFO__TXN_STATUS__UNKNOWN, 0, 0, NULL, NULL }
 
 
-struct  _Wa__PendingKeyExchange
+struct  Wa__PendingKeyExchange : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_sequence;
   uint32_t sequence;
   protobuf_c_boolean has_localbasekey;
@@ -3597,9 +3442,8 @@ struct  _Wa__PendingKeyExchange
     , 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__PendingPreKey
+struct  Wa__PendingPreKey : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_prekeyid;
   uint32_t prekeyid;
   protobuf_c_boolean has_signedprekeyid;
@@ -3612,9 +3456,8 @@ struct  _Wa__PendingPreKey
     , 0, 0, 0, 0, 0, {0,NULL} }
 
 
-struct  _Wa__PhotoChange
+struct  Wa__PhotoChange : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_oldphoto;
   ProtobufCBinaryData oldphoto;
   protobuf_c_boolean has_newphoto;
@@ -3627,9 +3470,8 @@ struct  _Wa__PhotoChange
     , 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
-struct  _Wa__Point
+struct  Wa__Point : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_xdeprecated;
   int32_t xdeprecated;
   protobuf_c_boolean has_ydeprecated;
@@ -3644,9 +3486,8 @@ struct  _Wa__Point
     , 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__PollAdditionalMetadata
+struct  Wa__PollAdditionalMetadata : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_pollinvalidated;
   protobuf_c_boolean pollinvalidated;
 };
@@ -3655,9 +3496,8 @@ struct  _Wa__PollAdditionalMetadata
     , 0, 0 }
 
 
-struct  _Wa__PollEncValue
+struct  Wa__PollEncValue : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_encpayload;
   ProtobufCBinaryData encpayload;
   protobuf_c_boolean has_enciv;
@@ -3668,9 +3508,8 @@ struct  _Wa__PollEncValue
     , 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__PollUpdate
+struct  Wa__PollUpdate : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *pollupdatemessagekey;
   Wa__Message__PollVoteMessage *vote;
   protobuf_c_boolean has_sendertimestampms;
@@ -3681,9 +3520,8 @@ struct  _Wa__PollUpdate
     , NULL, NULL, 0, 0 }
 
 
-struct  _Wa__PreKeyRecordStructure
+struct  Wa__PreKeyRecordStructure : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_id;
   uint32_t id;
   protobuf_c_boolean has_publickey;
@@ -3696,9 +3534,8 @@ struct  _Wa__PreKeyRecordStructure
     , 0, 0, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__Pushname
+struct  Wa__Pushname : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *id;
   char *pushname;
 };
@@ -3707,9 +3544,8 @@ struct  _Wa__Pushname
     , NULL, NULL }
 
 
-struct  _Wa__Reaction
+struct  Wa__Reaction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *key;
   char *text;
   char *groupingkey;
@@ -3723,9 +3559,8 @@ struct  _Wa__Reaction
     , NULL, NULL, NULL, 0, 0, 0, 0 }
 
 
-struct  _Wa__RecentEmojiWeight
+struct  Wa__RecentEmojiWeight : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *emoji;
   protobuf_c_boolean has_weight;
   float weight;
@@ -3735,9 +3570,8 @@ struct  _Wa__RecentEmojiWeight
     , NULL, 0, 0 }
 
 
-struct  _Wa__RecordStructure
+struct  Wa__RecordStructure : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__SessionStructure *currentsession;
   size_t n_previoussessions;
   Wa__SessionStructure **previoussessions;
@@ -3747,9 +3581,8 @@ struct  _Wa__RecordStructure
     , NULL, 0,NULL }
 
 
-struct  _Wa__SenderChainKey
+struct  Wa__SenderChainKey : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_iteration;
   uint32_t iteration;
   protobuf_c_boolean has_seed;
@@ -3760,9 +3593,8 @@ struct  _Wa__SenderChainKey
     , 0, 0, 0, {0,NULL} }
 
 
-struct  _Wa__SenderKeyRecordStructure
+struct  Wa__SenderKeyRecordStructure : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_senderkeystates;
   Wa__SenderKeyStateStructure **senderkeystates;
 };
@@ -3771,9 +3603,8 @@ struct  _Wa__SenderKeyRecordStructure
     , 0,NULL }
 
 
-struct  _Wa__SenderKeyStateStructure
+struct  Wa__SenderKeyStateStructure : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_senderkeyid;
   uint32_t senderkeyid;
   Wa__SenderChainKey *senderchainkey;
@@ -3786,9 +3617,8 @@ struct  _Wa__SenderKeyStateStructure
     , 0, 0, NULL, NULL, 0,NULL }
 
 
-struct  _Wa__SenderMessageKey
+struct  Wa__SenderMessageKey : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_iteration;
   uint32_t iteration;
   protobuf_c_boolean has_seed;
@@ -3799,9 +3629,8 @@ struct  _Wa__SenderMessageKey
     , 0, 0, 0, {0,NULL} }
 
 
-struct  _Wa__SenderSigningKey
+struct  Wa__SenderSigningKey : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_public_;
   ProtobufCBinaryData public_;
   protobuf_c_boolean has_private_;
@@ -3812,9 +3641,8 @@ struct  _Wa__SenderSigningKey
     , 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__ServerErrorReceipt
+struct  Wa__ServerErrorReceipt : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *stanzaid;
 };
 #define WA__SERVER_ERROR_RECEIPT__INIT \
@@ -3822,9 +3650,8 @@ struct  _Wa__ServerErrorReceipt
     , NULL }
 
 
-struct  _Wa__SessionStructure
+struct  Wa__SessionStructure : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_sessionversion;
   uint32_t sessionversion;
   protobuf_c_boolean has_localidentitypublic;
@@ -3854,9 +3681,8 @@ struct  _Wa__SessionStructure
     , 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, 0, NULL, 0,NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL} }
 
 
-struct  _Wa__SignedPreKeyRecordStructure
+struct  Wa__SignedPreKeyRecordStructure : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_id;
   uint32_t id;
   protobuf_c_boolean has_publickey;
@@ -3873,9 +3699,8 @@ struct  _Wa__SignedPreKeyRecordStructure
     , 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
-struct  _Wa__StatusPSA
+struct  Wa__StatusPSA : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   uint64_t campaignid;
   protobuf_c_boolean has_campaignexpirationtimestamp;
   uint64_t campaignexpirationtimestamp;
@@ -3885,9 +3710,8 @@ struct  _Wa__StatusPSA
     , 0, 0, 0 }
 
 
-struct  _Wa__StickerMetadata
+struct  Wa__StickerMetadata : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *url;
   protobuf_c_boolean has_filesha256;
   ProtobufCBinaryData filesha256;
@@ -3911,9 +3735,8 @@ struct  _Wa__StickerMetadata
     , NULL, 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL}, NULL, 0, 0, 0, 0, NULL, 0, 0, 0, 0 }
 
 
-struct  _Wa__SyncActionData
+struct  Wa__SyncActionData : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_index;
   ProtobufCBinaryData index;
   Wa__SyncActionValue *value;
@@ -3927,9 +3750,8 @@ struct  _Wa__SyncActionData
     , 0, {0,NULL}, NULL, 0, {0,NULL}, 0, 0 }
 
 
-struct  _Wa__SyncActionValue__AgentAction
+struct  Wa__SyncActionValue__AgentAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *name;
   protobuf_c_boolean has_deviceid;
   int32_t deviceid;
@@ -3941,9 +3763,8 @@ struct  _Wa__SyncActionValue__AgentAction
     , NULL, 0, 0, 0, 0 }
 
 
-struct  _Wa__SyncActionValue__AndroidUnsupportedActions
+struct  Wa__SyncActionValue__AndroidUnsupportedActions : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_allowed;
   protobuf_c_boolean allowed;
 };
@@ -3952,9 +3773,8 @@ struct  _Wa__SyncActionValue__AndroidUnsupportedActions
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue__ArchiveChatAction
+struct  Wa__SyncActionValue__ArchiveChatAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_archived;
   protobuf_c_boolean archived;
   Wa__SyncActionValue__SyncActionMessageRange *messagerange;
@@ -3964,9 +3784,8 @@ struct  _Wa__SyncActionValue__ArchiveChatAction
     , 0, 0, NULL }
 
 
-struct  _Wa__SyncActionValue__ClearChatAction
+struct  Wa__SyncActionValue__ClearChatAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__SyncActionValue__SyncActionMessageRange *messagerange;
 };
 #define WA__SYNC_ACTION_VALUE__CLEAR_CHAT_ACTION__INIT \
@@ -3974,9 +3793,8 @@ struct  _Wa__SyncActionValue__ClearChatAction
     , NULL }
 
 
-struct  _Wa__SyncActionValue__ContactAction
+struct  Wa__SyncActionValue__ContactAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *fullname;
   char *firstname;
 };
@@ -3985,9 +3803,8 @@ struct  _Wa__SyncActionValue__ContactAction
     , NULL, NULL }
 
 
-struct  _Wa__SyncActionValue__DeleteChatAction
+struct  Wa__SyncActionValue__DeleteChatAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__SyncActionValue__SyncActionMessageRange *messagerange;
 };
 #define WA__SYNC_ACTION_VALUE__DELETE_CHAT_ACTION__INIT \
@@ -3995,9 +3812,8 @@ struct  _Wa__SyncActionValue__DeleteChatAction
     , NULL }
 
 
-struct  _Wa__SyncActionValue__DeleteMessageForMeAction
+struct  Wa__SyncActionValue__DeleteMessageForMeAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_deletemedia;
   protobuf_c_boolean deletemedia;
   protobuf_c_boolean has_messagetimestamp;
@@ -4008,9 +3824,8 @@ struct  _Wa__SyncActionValue__DeleteMessageForMeAction
     , 0, 0, 0, 0 }
 
 
-struct  _Wa__SyncActionValue__KeyExpiration
+struct  Wa__SyncActionValue__KeyExpiration : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_expiredkeyepoch;
   int32_t expiredkeyepoch;
 };
@@ -4019,9 +3834,8 @@ struct  _Wa__SyncActionValue__KeyExpiration
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue__LabelAssociationAction
+struct  Wa__SyncActionValue__LabelAssociationAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_labeled;
   protobuf_c_boolean labeled;
 };
@@ -4030,9 +3844,8 @@ struct  _Wa__SyncActionValue__LabelAssociationAction
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue__LabelEditAction
+struct  Wa__SyncActionValue__LabelEditAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *name;
   protobuf_c_boolean has_color;
   int32_t color;
@@ -4046,9 +3859,8 @@ struct  _Wa__SyncActionValue__LabelEditAction
     , NULL, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__SyncActionValue__LocaleSetting
+struct  Wa__SyncActionValue__LocaleSetting : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *locale;
 };
 #define WA__SYNC_ACTION_VALUE__LOCALE_SETTING__INIT \
@@ -4056,9 +3868,8 @@ struct  _Wa__SyncActionValue__LocaleSetting
     , NULL }
 
 
-struct  _Wa__SyncActionValue__MarkChatAsReadAction
+struct  Wa__SyncActionValue__MarkChatAsReadAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_read;
   protobuf_c_boolean read;
   Wa__SyncActionValue__SyncActionMessageRange *messagerange;
@@ -4068,9 +3879,8 @@ struct  _Wa__SyncActionValue__MarkChatAsReadAction
     , 0, 0, NULL }
 
 
-struct  _Wa__SyncActionValue__MuteAction
+struct  Wa__SyncActionValue__MuteAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_muted;
   protobuf_c_boolean muted;
   protobuf_c_boolean has_muteendtimestamp;
@@ -4081,9 +3891,8 @@ struct  _Wa__SyncActionValue__MuteAction
     , 0, 0, 0, 0 }
 
 
-struct  _Wa__SyncActionValue__NuxAction
+struct  Wa__SyncActionValue__NuxAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_acknowledged;
   protobuf_c_boolean acknowledged;
 };
@@ -4092,9 +3901,8 @@ struct  _Wa__SyncActionValue__NuxAction
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue__PinAction
+struct  Wa__SyncActionValue__PinAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_pinned;
   protobuf_c_boolean pinned;
 };
@@ -4103,9 +3911,8 @@ struct  _Wa__SyncActionValue__PinAction
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue__PrimaryFeature
+struct  Wa__SyncActionValue__PrimaryFeature : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_flags;
   char **flags;
 };
@@ -4114,9 +3921,8 @@ struct  _Wa__SyncActionValue__PrimaryFeature
     , 0,NULL }
 
 
-struct  _Wa__SyncActionValue__PrimaryVersionAction
+struct  Wa__SyncActionValue__PrimaryVersionAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *version;
 };
 #define WA__SYNC_ACTION_VALUE__PRIMARY_VERSION_ACTION__INIT \
@@ -4124,9 +3930,8 @@ struct  _Wa__SyncActionValue__PrimaryVersionAction
     , NULL }
 
 
-struct  _Wa__SyncActionValue__PushNameSetting
+struct  Wa__SyncActionValue__PushNameSetting : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *name;
 };
 #define WA__SYNC_ACTION_VALUE__PUSH_NAME_SETTING__INIT \
@@ -4134,9 +3939,8 @@ struct  _Wa__SyncActionValue__PushNameSetting
     , NULL }
 
 
-struct  _Wa__SyncActionValue__QuickReplyAction
+struct  Wa__SyncActionValue__QuickReplyAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *shortcut;
   char *message;
   size_t n_keywords;
@@ -4151,9 +3955,8 @@ struct  _Wa__SyncActionValue__QuickReplyAction
     , NULL, NULL, 0,NULL, 0, 0, 0, 0 }
 
 
-struct  _Wa__SyncActionValue__RecentEmojiWeightsAction
+struct  Wa__SyncActionValue__RecentEmojiWeightsAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_weights;
   Wa__RecentEmojiWeight **weights;
 };
@@ -4162,9 +3965,8 @@ struct  _Wa__SyncActionValue__RecentEmojiWeightsAction
     , 0,NULL }
 
 
-struct  _Wa__SyncActionValue__SecurityNotificationSetting
+struct  Wa__SyncActionValue__SecurityNotificationSetting : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_shownotification;
   protobuf_c_boolean shownotification;
 };
@@ -4173,9 +3975,8 @@ struct  _Wa__SyncActionValue__SecurityNotificationSetting
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue__StarAction
+struct  Wa__SyncActionValue__StarAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_starred;
   protobuf_c_boolean starred;
 };
@@ -4184,9 +3985,8 @@ struct  _Wa__SyncActionValue__StarAction
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue__StickerAction
+struct  Wa__SyncActionValue__StickerAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *url;
   protobuf_c_boolean has_fileencsha256;
   ProtobufCBinaryData fileencsha256;
@@ -4210,9 +4010,8 @@ struct  _Wa__SyncActionValue__StickerAction
     , NULL, 0, {0,NULL}, 0, {0,NULL}, NULL, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__SyncActionValue__SubscriptionAction
+struct  Wa__SyncActionValue__SubscriptionAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_isdeactivated;
   protobuf_c_boolean isdeactivated;
   protobuf_c_boolean has_isautorenewing;
@@ -4225,9 +4024,8 @@ struct  _Wa__SyncActionValue__SubscriptionAction
     , 0, 0, 0, 0, 0, 0 }
 
 
-struct  _Wa__SyncActionValue__SyncActionMessageRange
+struct  Wa__SyncActionValue__SyncActionMessageRange : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_lastmessagetimestamp;
   int64_t lastmessagetimestamp;
   protobuf_c_boolean has_lastsystemmessagetimestamp;
@@ -4240,9 +4038,8 @@ struct  _Wa__SyncActionValue__SyncActionMessageRange
     , 0, 0, 0, 0, 0,NULL }
 
 
-struct  _Wa__SyncActionValue__SyncActionMessage
+struct  Wa__SyncActionValue__SyncActionMessage : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *key;
   protobuf_c_boolean has_timestamp;
   int64_t timestamp;
@@ -4252,9 +4049,8 @@ struct  _Wa__SyncActionValue__SyncActionMessage
     , NULL, 0, 0 }
 
 
-struct  _Wa__SyncActionValue__TimeFormatAction
+struct  Wa__SyncActionValue__TimeFormatAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_istwentyfourhourformatenabled;
   protobuf_c_boolean istwentyfourhourformatenabled;
 };
@@ -4263,9 +4059,8 @@ struct  _Wa__SyncActionValue__TimeFormatAction
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue__UnarchiveChatsSetting
+struct  Wa__SyncActionValue__UnarchiveChatsSetting : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_unarchivechats;
   protobuf_c_boolean unarchivechats;
 };
@@ -4274,9 +4069,8 @@ struct  _Wa__SyncActionValue__UnarchiveChatsSetting
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue__UserStatusMuteAction
+struct  Wa__SyncActionValue__UserStatusMuteAction : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_muted;
   protobuf_c_boolean muted;
 };
@@ -4285,9 +4079,8 @@ struct  _Wa__SyncActionValue__UserStatusMuteAction
     , 0, 0 }
 
 
-struct  _Wa__SyncActionValue
+struct  Wa__SyncActionValue : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_timestamp;
   int64_t timestamp;
   Wa__SyncActionValue__StarAction *staraction;
@@ -4323,9 +4116,8 @@ struct  _Wa__SyncActionValue
     , 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 
 
-struct  _Wa__SyncdIndex
+struct  Wa__SyncdIndex : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_blob;
   ProtobufCBinaryData blob;
 };
@@ -4334,9 +4126,8 @@ struct  _Wa__SyncdIndex
     , 0, {0,NULL} }
 
 
-struct  _Wa__SyncdMutation
+struct  Wa__SyncdMutation : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_operation;
   Wa__SyncdMutation__SyncdOperation operation;
   Wa__SyncdRecord *record;
@@ -4346,9 +4137,8 @@ struct  _Wa__SyncdMutation
     , 0, WA__SYNCD_MUTATION__SYNCD_OPERATION__SET, NULL }
 
 
-struct  _Wa__SyncdMutations
+struct  Wa__SyncdMutations : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   size_t n_mutations;
   Wa__SyncdMutation **mutations;
 };
@@ -4357,9 +4147,8 @@ struct  _Wa__SyncdMutations
     , 0,NULL }
 
 
-struct  _Wa__SyncdPatch
+struct  Wa__SyncdPatch : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__SyncdVersion *version;
   size_t n_mutations;
   Wa__SyncdMutation **mutations;
@@ -4378,9 +4167,8 @@ struct  _Wa__SyncdPatch
     , NULL, 0,NULL, NULL, 0, {0,NULL}, 0, {0,NULL}, NULL, NULL, 0, 0 }
 
 
-struct  _Wa__SyncdRecord
+struct  Wa__SyncdRecord : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__SyncdIndex *index;
   Wa__SyncdValue *value;
   Wa__KeyId *keyid;
@@ -4390,9 +4178,8 @@ struct  _Wa__SyncdRecord
     , NULL, NULL, NULL }
 
 
-struct  _Wa__SyncdSnapshot
+struct  Wa__SyncdSnapshot : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__SyncdVersion *version;
   size_t n_records;
   Wa__SyncdRecord **records;
@@ -4405,9 +4192,8 @@ struct  _Wa__SyncdSnapshot
     , NULL, 0,NULL, 0, {0,NULL}, NULL }
 
 
-struct  _Wa__SyncdValue
+struct  Wa__SyncdValue : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_blob;
   ProtobufCBinaryData blob;
 };
@@ -4416,9 +4202,8 @@ struct  _Wa__SyncdValue
     , 0, {0,NULL} }
 
 
-struct  _Wa__SyncdVersion
+struct  Wa__SyncdVersion : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_version;
   uint64_t version;
 };
@@ -4427,9 +4212,8 @@ struct  _Wa__SyncdVersion
     , 0, 0 }
 
 
-struct  _Wa__TemplateButton__CallButton
+struct  Wa__TemplateButton__CallButton : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__HighlyStructuredMessage *displaytext;
   Wa__Message__HighlyStructuredMessage *phonenumber;
 };
@@ -4438,9 +4222,8 @@ struct  _Wa__TemplateButton__CallButton
     , NULL, NULL }
 
 
-struct  _Wa__TemplateButton__QuickReplyButton
+struct  Wa__TemplateButton__QuickReplyButton : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__HighlyStructuredMessage *displaytext;
   char *id;
 };
@@ -4449,9 +4232,8 @@ struct  _Wa__TemplateButton__QuickReplyButton
     , NULL, NULL }
 
 
-struct  _Wa__TemplateButton__URLButton
+struct  Wa__TemplateButton__URLButton : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__Message__HighlyStructuredMessage *displaytext;
   Wa__Message__HighlyStructuredMessage *url;
 };
@@ -4468,9 +4250,8 @@ typedef enum {
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WA__TEMPLATE_BUTTON__BUTTON)
 } Wa__TemplateButton__ButtonCase;
 
-struct  _Wa__TemplateButton
+struct  Wa__TemplateButton : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_index;
   uint32_t index;
   Wa__TemplateButton__ButtonCase button_case;
@@ -4485,9 +4266,8 @@ struct  _Wa__TemplateButton
     , 0, 0, WA__TEMPLATE_BUTTON__BUTTON__NOT_SET, {0} }
 
 
-struct  _Wa__UserReceipt
+struct  Wa__UserReceipt : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *userjid;
   protobuf_c_boolean has_receipttimestamp;
   int64_t receipttimestamp;
@@ -4505,9 +4285,8 @@ struct  _Wa__UserReceipt
     , NULL, 0, 0, 0, 0, 0, 0, 0,NULL, 0,NULL }
 
 
-struct  _Wa__VerifiedNameCertificate__Details
+struct  Wa__VerifiedNameCertificate__Details : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_serial;
   uint64_t serial;
   char *issuer;
@@ -4522,9 +4301,8 @@ struct  _Wa__VerifiedNameCertificate__Details
     , 0, 0, NULL, NULL, 0,NULL, 0, 0 }
 
 
-struct  _Wa__VerifiedNameCertificate
+struct  Wa__VerifiedNameCertificate : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_details;
   ProtobufCBinaryData details;
   protobuf_c_boolean has_signature;
@@ -4537,9 +4315,8 @@ struct  _Wa__VerifiedNameCertificate
     , 0, {0,NULL}, 0, {0,NULL}, 0, {0,NULL} }
 
 
-struct  _Wa__WallpaperSettings
+struct  Wa__WallpaperSettings : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   char *filename;
   protobuf_c_boolean has_opacity;
   uint32_t opacity;
@@ -4549,9 +4326,8 @@ struct  _Wa__WallpaperSettings
     , NULL, 0, 0 }
 
 
-struct  _Wa__WebFeatures
+struct  Wa__WebFeatures : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_labelsdisplay;
   Wa__WebFeatures__Flag labelsdisplay;
   protobuf_c_boolean has_voipindividualoutgoing;
@@ -4648,9 +4424,8 @@ struct  _Wa__WebFeatures
     , 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED, 0, WA__WEB_FEATURES__FLAG__NOT_STARTED }
 
 
-struct  _Wa__WebMessageInfo
+struct  Wa__WebMessageInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   Wa__MessageKey *key;
   Wa__Message *message;
   protobuf_c_boolean has_messagetimestamp;
@@ -4727,9 +4502,8 @@ struct  _Wa__WebMessageInfo
     , NULL, NULL, 0, 0, 0, WA__WEB_MESSAGE_INFO__STATUS__ERROR, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0, WA__WEB_MESSAGE_INFO__STUB_TYPE__UNKNOWN, 0, 0, 0,NULL, 0, 0, 0,NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, WA__WEB_MESSAGE_INFO__BIZ_PRIVACY_STATUS__E2EE, NULL, NULL, NULL, 0,NULL, 0,NULL, NULL, 0, {0,NULL}, NULL, 0,NULL, NULL, NULL, 0, 0, 0, {0,NULL}, NULL, NULL, 0, 0 }
 
 
-struct  _Wa__WebNotificationsInfo
+struct  Wa__WebNotificationsInfo : public ProtobufCMessage
 {
-  ProtobufCMessage base;
   protobuf_c_boolean has_timestamp;
   uint64_t timestamp;
   protobuf_c_boolean has_unreadchats;
diff --git a/protocols/WhatsApp/src/pmsg.proto.h b/protocols/WhatsApp/src/pmsg.proto.h
index 90071480a5..1784124b12 100644
--- a/protocols/WhatsApp/src/pmsg.proto.h
+++ b/protocols/WhatsApp/src/pmsg.proto.h
@@ -3,27 +3,27 @@
 namespace proto
 {
 	#define PROTOBUF_PTR(T,D) \
-	class T : public _Wa__##T { \
-	T* p; \
+	class T { \
+	Wa__##T* p; \
 	public: \
-	T(const MBinBuffer &buf) : p((T*)protobuf_c_message_unpack(&D, 0, buf.length(), buf.data())) {} \
-	T(const ProtobufCBinaryData &data) : p((T*)protobuf_c_message_unpack(&D, 0, data.len, data.data)) {} \
-	T(const uint8_t *pData, size_t len) : p((T*)protobuf_c_message_unpack(&D, 0, len, pData)) {} \
-	~T() { protobuf_c_message_free_unpacked((ProtobufCMessage*)p,0); } \
-	operator T& () const { return *p; } \
-	operator const ProtobufCMessage*() const { return (const ProtobufCMessage*)p; } \
+	T(const MBinBuffer &buf) : p((Wa__##T*)protobuf_c_message_unpack(&D, 0, buf.length(), buf.data())) {} \
+	T(const ProtobufCBinaryData &data) : p((Wa__##T*)protobuf_c_message_unpack(&D, 0, data.len, data.data)) {} \
+	T(const uint8_t *pData, size_t len) : p((Wa__##T*)protobuf_c_message_unpack(&D, 0, len, pData)) {} \
+	~T() { protobuf_c_message_free_unpacked(p,0); } \
+	Wa__##T* operator->() const { return p; } \
+	operator Wa__##T*() const { return p; } \
 	};
 
-	struct SyncActionValue : public _Wa__SyncActionValue
+	struct SyncActionValue : public Wa__SyncActionValue
 	{ };
 
-	struct SyncdRecord : public _Wa__SyncdRecord
+	struct SyncdRecord : public Wa__SyncdRecord
 	{ };
 
-	struct SenderKeyDistributionMessage : public _Wa__Message__SenderKeyDistributionMessage
+	struct SenderKeyDistributionMessage : public Wa__Message__SenderKeyDistributionMessage
 	{ };
 
-	struct WebMessageInfo : public _Wa__WebMessageInfo
+	struct WebMessageInfo : public Wa__WebMessageInfo
 	{ };
 
 	PROTOBUF_PTR(ADVDeviceIdentity, wa__advdevice_identity__descriptor);
diff --git a/protocols/WhatsApp/src/proto.h b/protocols/WhatsApp/src/proto.h
index 247aedd924..965fbb7ce6 100644
--- a/protocols/WhatsApp/src/proto.h
+++ b/protocols/WhatsApp/src/proto.h
@@ -311,7 +311,7 @@ class WhatsAppProto : public PROTO<WhatsAppProto>
 	void ProcessReceipt(MCONTACT hContact, const char *msgId, bool bRead);
 
 	bool WSReadPacket(const WSHeader &hdr, MBinBuffer &buf);
-	int  WSSend(const ProtobufCMessage *msg);
+	int  WSSend(const ProtobufCMessage &msg);
 	int  WSSendNode(WANode &node, WA_PKT_HANDLER = nullptr);
 
 	MBinBuffer DownloadEncryptedFile(const char *url, const ProtobufCBinaryData &mediaKeys, const char *pszType);
diff --git a/protocols/WhatsApp/src/server.cpp b/protocols/WhatsApp/src/server.cpp
index 61698c0e17..fa57b7c189 100644
--- a/protocols/WhatsApp/src/server.cpp
+++ b/protocols/WhatsApp/src/server.cpp
@@ -54,8 +54,9 @@ void WhatsAppProto::ServerThreadWorker()
 	client.ephemeral = {m_noise->ephemeral.pub.length(), m_noise->ephemeral.pub.data()};
 	client.has_ephemeral = true;
 
-	Wa__HandshakeMessage msg; msg.clienthello = &client;
-	WSSend((ProtobufCMessage*)&msg);
+	Wa__HandshakeMessage msg = WA__HANDSHAKE_MESSAGE__INIT;
+	msg.clienthello = &client;
+	WSSend(msg);
 
 	MBinBuffer netbuf;
 
diff --git a/protocols/WhatsApp/src/signal.cpp b/protocols/WhatsApp/src/signal.cpp
index 1c92fffdea..8207a7462d 100644
--- a/protocols/WhatsApp/src/signal.cpp
+++ b/protocols/WhatsApp/src/signal.cpp
@@ -540,7 +540,7 @@ MBinBuffer MSignalStore::encodeSignedIdentity(bool bIncludeSignatureKey)
 	proto::ADVSignedDeviceIdentity identity(pProto->getBlob("WAAccount"));
 	
 	if (!bIncludeSignatureKey)
-		proto::CleanBinary(identity.accountsignaturekey), identity.has_accountsignaturekey = false;
+		proto::CleanBinary(identity->accountsignaturekey), identity->has_accountsignaturekey = false;
 	
 	return proto::Serialize(identity);
 }
diff --git a/protocols/WhatsApp/src/utils.cpp b/protocols/WhatsApp/src/utils.cpp
index a46afb65b3..592d509253 100644
--- a/protocols/WhatsApp/src/utils.cpp
+++ b/protocols/WhatsApp/src/utils.cpp
@@ -167,12 +167,12 @@ CMStringA WhatsAppProto::GenerateMessageId()
 /////////////////////////////////////////////////////////////////////////////////////////
 // sends a piece of JSON to a server via a websocket, masked
 
-int WhatsAppProto::WSSend(const ProtobufCMessage *msg)
+int WhatsAppProto::WSSend(const ProtobufCMessage &msg)
 {
 	if (m_hServerConn == nullptr)
 		return -1;
 
-	MBinBuffer buf(proto::Serialize(msg));
+	MBinBuffer buf(proto::Serialize(&msg));
 	Netlib_Dump(m_hServerConn, buf.data(), buf.length(), true, 0);
 
 	MBinBuffer payload = m_noise->encodeFrame(buf.data(), buf.length());