diff --git a/parsers/src/bind.rs b/parsers/src/bind.rs
index 982cbcaa1b9baa913e6c0339c475e7caffa3e1f4..dc75307b9b49adc431e808da2ab0a97f5fe81953 100644
--- a/parsers/src/bind.rs
+++ b/parsers/src/bind.rs
@@ -143,7 +143,7 @@ mod tests {
     #[test]
     fn test_size() {
         assert_size!(BindQuery, 12);
-        assert_size!(BindResponse, 36);
+        assert_size!(BindResponse, 16);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/bookmarks.rs b/parsers/src/bookmarks.rs
index cbaea94ac0ef1a214d3e696b18ea285830692032..9ed2433bcdc93da6423f60d0d6173858241644be 100644
--- a/parsers/src/bookmarks.rs
+++ b/parsers/src/bookmarks.rs
@@ -76,7 +76,7 @@ mod tests {
     #[cfg(target_pointer_width = "32")]
     #[test]
     fn test_size() {
-        assert_size!(Conference, 64);
+        assert_size!(Conference, 56);
         assert_size!(Url, 24);
         assert_size!(Storage, 24);
     }
diff --git a/parsers/src/carbons.rs b/parsers/src/carbons.rs
index 47b08da8a39dc963bda66f3af5eb72faac082c4b..010830f7387c31aa4b76784343c6285bc24024de 100644
--- a/parsers/src/carbons.rs
+++ b/parsers/src/carbons.rs
@@ -72,8 +72,8 @@ mod tests {
         assert_size!(Enable, 0);
         assert_size!(Disable, 0);
         assert_size!(Private, 0);
-        assert_size!(Received, 212);
-        assert_size!(Sent, 212);
+        assert_size!(Received, 152);
+        assert_size!(Sent, 152);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/delay.rs b/parsers/src/delay.rs
index a0c52258d829fe105a5ee715177c6678b8ed4466..dcaad9f689eba2dba971a617af5a9dd7eaae7f1d 100644
--- a/parsers/src/delay.rs
+++ b/parsers/src/delay.rs
@@ -41,7 +41,7 @@ mod tests {
     #[cfg(target_pointer_width = "32")]
     #[test]
     fn test_size() {
-        assert_size!(Delay, 68);
+        assert_size!(Delay, 48);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/disco.rs b/parsers/src/disco.rs
index 5e4e071382ade6da1293d5769ab624a52e819658..db162cf67d81474e5dc1f7d9fbc414b5298508b2 100644
--- a/parsers/src/disco.rs
+++ b/parsers/src/disco.rs
@@ -241,7 +241,7 @@ mod tests {
         assert_size!(DiscoInfoQuery, 12);
         assert_size!(DiscoInfoResult, 48);
 
-        assert_size!(Item, 64);
+        assert_size!(Item, 44);
         assert_size!(DiscoItemsQuery, 12);
         assert_size!(DiscoItemsResult, 24);
     }
diff --git a/parsers/src/forwarding.rs b/parsers/src/forwarding.rs
index 459005807d951e5e8a24b522d99396d8a101e37a..75008ea4147ceaf09a629348c9b8ea2ca50ed5d7 100644
--- a/parsers/src/forwarding.rs
+++ b/parsers/src/forwarding.rs
@@ -33,7 +33,7 @@ mod tests {
     #[cfg(target_pointer_width = "32")]
     #[test]
     fn test_size() {
-        assert_size!(Forwarded, 212);
+        assert_size!(Forwarded, 152);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/iq.rs b/parsers/src/iq.rs
index 5239b39efb7361bcdabb9ccbdb9a5d7159585db5..b725a8f9e77dddf98b30987b8836cb9d61cd7a1c 100644
--- a/parsers/src/iq.rs
+++ b/parsers/src/iq.rs
@@ -233,8 +233,8 @@ mod tests {
     #[cfg(target_pointer_width = "32")]
     #[test]
     fn test_size() {
-        assert_size!(IqType, 120);
-        assert_size!(Iq, 212);
+        assert_size!(IqType, 96);
+        assert_size!(Iq, 148);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/jid_prep.rs b/parsers/src/jid_prep.rs
index 69c767e9dd0ec92a1186f5dd4de0c56d9470c35d..74683634a7ec92ff9e8ffd88501cd531b1518acc 100644
--- a/parsers/src/jid_prep.rs
+++ b/parsers/src/jid_prep.rs
@@ -48,7 +48,7 @@ mod tests {
     #[test]
     fn test_size() {
         assert_size!(JidPrepQuery, 12);
-        assert_size!(JidPrepResponse, 40);
+        assert_size!(JidPrepResponse, 20);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/jingle.rs b/parsers/src/jingle.rs
index 0784f3c8c378704053fe572c38a8082a8040e379..e97cd6614c47469ad31cb552b06edc8809157c70 100644
--- a/parsers/src/jingle.rs
+++ b/parsers/src/jingle.rs
@@ -689,11 +689,11 @@ mod tests {
         assert_size!(Senders, 1);
         assert_size!(Disposition, 1);
         assert_size!(ContentId, 12);
-        assert_size!(Content, 228);
+        assert_size!(Content, 220);
         assert_size!(Reason, 1);
         assert_size!(ReasonElement, 16);
         assert_size!(SessionId, 12);
-        assert_size!(Jingle, 152);
+        assert_size!(Jingle, 112);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/jingle_ice_udp.rs b/parsers/src/jingle_ice_udp.rs
index fdda570b94a8a34a83137212409fec5412f07f10..a9907ad676c9662f78bded02bf24b10c684957c7 100644
--- a/parsers/src/jingle_ice_udp.rs
+++ b/parsers/src/jingle_ice_udp.rs
@@ -121,7 +121,7 @@ mod tests {
     fn test_size() {
         assert_size!(Transport, 68);
         assert_size!(Type, 1);
-        assert_size!(Candidate, 92);
+        assert_size!(Candidate, 88);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/jingle_raw_udp.rs b/parsers/src/jingle_raw_udp.rs
index b2624bfd97bbbdfbf84d4e433ef0601f318a0f6e..bf3c4b147b52b389482f478766b5cfa3f3d9f910 100644
--- a/parsers/src/jingle_raw_udp.rs
+++ b/parsers/src/jingle_raw_udp.rs
@@ -66,7 +66,7 @@ mod tests {
     #[test]
     fn test_size() {
         assert_size!(Transport, 12);
-        assert_size!(Candidate, 40);
+        assert_size!(Candidate, 36);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/jingle_s5b.rs b/parsers/src/jingle_s5b.rs
index 1e1a8e4fc135c4907918655f456bf812928b9b1c..2a5ba02ccae275ab019d9a66476acb5cb6a6760f 100644
--- a/parsers/src/jingle_s5b.rs
+++ b/parsers/src/jingle_s5b.rs
@@ -285,7 +285,7 @@ mod tests {
         assert_size!(Mode, 1);
         assert_size!(CandidateId, 12);
         assert_size!(StreamId, 12);
-        assert_size!(Candidate, 84);
+        assert_size!(Candidate, 60);
         assert_size!(TransportPayload, 16);
         assert_size!(Transport, 44);
     }
diff --git a/parsers/src/mam.rs b/parsers/src/mam.rs
index a8a0551cbe1a40e6016ea9a949b9605f2f35794d..42c541c855fd908e99f5a0bd9a3701ceb7d652f9 100644
--- a/parsers/src/mam.rs
+++ b/parsers/src/mam.rs
@@ -99,7 +99,7 @@ mod tests {
     fn test_size() {
         assert_size!(QueryId, 12);
         assert_size!(Query, 116);
-        assert_size!(Result_, 236);
+        assert_size!(Result_, 176);
         assert_size!(Complete, 1);
         assert_size!(Fin, 44);
     }
diff --git a/parsers/src/message.rs b/parsers/src/message.rs
index 1c8609476ec4c9cde564415d89d4d0407022d2b3..45b58f9f613ef7a43126eae49141a48d834f4af7 100644
--- a/parsers/src/message.rs
+++ b/parsers/src/message.rs
@@ -308,7 +308,7 @@ mod tests {
         assert_size!(Body, 12);
         assert_size!(Subject, 12);
         assert_size!(Thread, 12);
-        assert_size!(Message, 144);
+        assert_size!(Message, 104);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/presence.rs b/parsers/src/presence.rs
index 5bc3cc7a3a38a04b16b6c40b4b8514edfd8ea5aa..dc7aa33d9b3db96f4017c64b5de0122d8e7baf54 100644
--- a/parsers/src/presence.rs
+++ b/parsers/src/presence.rs
@@ -385,7 +385,7 @@ mod tests {
     fn test_size() {
         assert_size!(Show, 1);
         assert_size!(Type, 1);
-        assert_size!(Presence, 120);
+        assert_size!(Presence, 80);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/roster.rs b/parsers/src/roster.rs
index 445a8bfab8e70af91b9fc5c9da436f83ccfb49cb..5062bb132756525beff7a551567886d583505825 100644
--- a/parsers/src/roster.rs
+++ b/parsers/src/roster.rs
@@ -102,7 +102,7 @@ mod tests {
         assert_size!(Group, 12);
         assert_size!(Subscription, 1);
         assert_size!(Ask, 1);
-        assert_size!(Item, 52);
+        assert_size!(Item, 44);
         assert_size!(Roster, 24);
     }
 
diff --git a/parsers/src/rtt.rs b/parsers/src/rtt.rs
index 6eb24eaef4b86d5692c1275c8e44a16596b66a3c..89a288b0b6f1c476424476c2e8457517aa461481 100644
--- a/parsers/src/rtt.rs
+++ b/parsers/src/rtt.rs
@@ -254,7 +254,7 @@ mod tests {
         assert_size!(Insert, 20);
         assert_size!(Erase, 12);
         assert_size!(Wait, 4);
-        assert_size!(Action, 24);
+        assert_size!(Action, 20);
         assert_size!(Rtt, 32);
     }
 
diff --git a/parsers/src/stanza_error.rs b/parsers/src/stanza_error.rs
index 03dd1032c9120b495299d6d6755596f21759f9ba..c6ae56988681f9cf9a9fac7392c2b7a80d9f5fdb 100644
--- a/parsers/src/stanza_error.rs
+++ b/parsers/src/stanza_error.rs
@@ -318,7 +318,7 @@ mod tests {
     fn test_size() {
         assert_size!(ErrorType, 1);
         assert_size!(DefinedCondition, 1);
-        assert_size!(StanzaError, 116);
+        assert_size!(StanzaError, 96);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/stanza_id.rs b/parsers/src/stanza_id.rs
index fadd5e8d28b888206c3efc02a4cd603f168a368e..bc72e1244ef03fc949a53d38e3a3a2251394ee65 100644
--- a/parsers/src/stanza_id.rs
+++ b/parsers/src/stanza_id.rs
@@ -45,7 +45,7 @@ mod tests {
     #[cfg(target_pointer_width = "32")]
     #[test]
     fn test_size() {
-        assert_size!(StanzaId, 52);
+        assert_size!(StanzaId, 32);
         assert_size!(OriginId, 12);
     }
 
diff --git a/parsers/src/stream.rs b/parsers/src/stream.rs
index 21dcab5b7c80322700b190c2a454b7c594efcc15..98a99c629c62627ca8f8e2cd89655d2b0196f8a5 100644
--- a/parsers/src/stream.rs
+++ b/parsers/src/stream.rs
@@ -79,7 +79,7 @@ mod tests {
     #[cfg(target_pointer_width = "32")]
     #[test]
     fn test_size() {
-        assert_size!(Stream, 84);
+        assert_size!(Stream, 68);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/websocket.rs b/parsers/src/websocket.rs
index ecd065df514b61d9e9cc8194d6841b137b972df9..001fe8affa9f810070f902615bc65261aee35c34 100644
--- a/parsers/src/websocket.rs
+++ b/parsers/src/websocket.rs
@@ -78,7 +78,7 @@ mod tests {
     #[cfg(target_pointer_width = "32")]
     #[test]
     fn test_size() {
-        assert_size!(Open, 84);
+        assert_size!(Open, 68);
     }
 
     #[cfg(target_pointer_width = "64")]
diff --git a/parsers/src/xhtml.rs b/parsers/src/xhtml.rs
index 39e47a6c4593ed01c7368fe1247653681fe87ac9..6d30255e7f96dfb454fc9994cfb8094cfe40c69c 100644
--- a/parsers/src/xhtml.rs
+++ b/parsers/src/xhtml.rs
@@ -505,7 +505,7 @@ mod tests {
     #[test]
     fn test_size() {
         assert_size!(XhtmlIm, 32);
-        assert_size!(Child, 56);
+        assert_size!(Child, 52);
         assert_size!(Tag, 52);
     }