omitting the empty map

diff --git a/tests/32-sequence-of-OK.asn1.-P b/tests/32-sequence-of-OK.asn1.-P
index 9d4a445..e7ba2bd 100644
--- a/tests/32-sequence-of-OK.asn1.-P
+++ b/tests/32-sequence-of-OK.asn1.-P
@@ -160,13 +160,11 @@
 static ber_tlv_tag_t asn_DEF_Error_1_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_Error_1_tag2el[] = {
-};
 static asn_SEQUENCE_specifics_t asn_SPC_Error_1_specs = {
 	sizeof(struct Error),
 	offsetof(struct Error, _asn_ctx),
-	asn_MAP_Error_1_tag2el,
-	0,	/* Count of tags in the map */
+	0,	/* No top level tags */
+	0,	/* No tags in the map */
 	-1,	/* Start extensions */
 	-1	/* Stop extensions */
 };
diff --git a/tests/60-any-OK.asn1 b/tests/60-any-OK.asn1
index 51723d9..e10c421 100644
--- a/tests/60-any-OK.asn1
+++ b/tests/60-any-OK.asn1
@@ -21,4 +21,9 @@
 		any	[0] ANY OPTIONAL
 	}
 
+	T3 ::= SEQUENCE {
+		any1	ANY,
+		any2	ANY
+	}
+
 END
diff --git a/tests/60-any-OK.asn1.-EF b/tests/60-any-OK.asn1.-EF
index 73c658f..89fa31d 100644
--- a/tests/60-any-OK.asn1.-EF
+++ b/tests/60-any-OK.asn1.-EF
@@ -13,4 +13,9 @@
     any	 [0] EXPLICIT ANY OPTIONAL
 }
 
+T3 ::= SEQUENCE {
+    any1	 ANY,
+    any2	 ANY
+}
+
 END
diff --git a/tests/60-any-OK.asn1.-P b/tests/60-any-OK.asn1.-P
index ed23340..3f80bde 100644
--- a/tests/60-any-OK.asn1.-P
+++ b/tests/60-any-OK.asn1.-P
@@ -149,3 +149,74 @@
 	&asn_SPC_T2_1_specs	/* Additional specs */
 };
 
+
+/*** <<< INCLUDES [T3] >>> ***/
+
+#include <ANY.h>
+#include <constr_SEQUENCE.h>
+
+/*** <<< TYPE-DECLS [T3] >>> ***/
+
+typedef struct T3 {
+	ANY_t	 any1;
+	ANY_t	 any2;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} T3_t;
+
+/*** <<< FUNC-DECLS [T3] >>> ***/
+
+extern asn_TYPE_descriptor_t asn_DEF_T3;
+
+/*** <<< STAT-DEFS [T3] >>> ***/
+
+static asn_TYPE_member_t asn_MBR_T3_1[] = {
+	{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct T3, any1),
+		.tag = -1 /* Ambiguous tag (ANY?) */,
+		.tag_mode = 0,
+		.type = (void *)&asn_DEF_ANY,
+		.memb_constraints = 0,	/* Defer constraints checking to the member type */
+		.name = "any1"
+		},
+	{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct T3, any2),
+		.tag = -1 /* Ambiguous tag (ANY?) */,
+		.tag_mode = 0,
+		.type = (void *)&asn_DEF_ANY,
+		.memb_constraints = 0,	/* Defer constraints checking to the member type */
+		.name = "any2"
+		},
+};
+static ber_tlv_tag_t asn_DEF_T3_1_tags[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SEQUENCE_specifics_t asn_SPC_T3_1_specs = {
+	sizeof(struct T3),
+	offsetof(struct T3, _asn_ctx),
+	0,	/* No top level tags */
+	0,	/* No tags in the map */
+	-1,	/* Start extensions */
+	-1	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_T3 = {
+	"T3",
+	"T3",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_T3_1_tags,
+	sizeof(asn_DEF_T3_1_tags)
+		/sizeof(asn_DEF_T3_1_tags[0]), /* 1 */
+	asn_DEF_T3_1_tags,	/* Same as above */
+	sizeof(asn_DEF_T3_1_tags)
+		/sizeof(asn_DEF_T3_1_tags[0]), /* 1 */
+	asn_MBR_T3_1,
+	2,	/* Elements count */
+	&asn_SPC_T3_1_specs	/* Additional specs */
+};
+
diff --git a/tests/69-reserved-words-OK.asn1.-P b/tests/69-reserved-words-OK.asn1.-P
index 96bf951..33db670 100644
--- a/tests/69-reserved-words-OK.asn1.-P
+++ b/tests/69-reserved-words-OK.asn1.-P
@@ -78,8 +78,6 @@
 static ber_tlv_tag_t asn_DEF_class_4_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_class_4_tag2el[] = {
-};
 static uint8_t asn_MAP_class_4_mmap[(0 + (8 * sizeof(unsigned int)) - 1) / 8] = {
 	0
 };