diff --git a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfindirect-choice b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfindirect-choice
index 47430a9..5679887 100644
--- a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfindirect-choice
+++ b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfindirect-choice
@@ -178,8 +178,8 @@
 asn_SEQUENCE_specifics_t asn_SPC_Everything_specs_1 = {
 	sizeof(struct Everything),
 	offsetof(struct Everything, _asn_ctx),
-	asn_MAP_Everything_tag2el_1,
-	10,	/* Count of tags in the map */
+	.tag2el = asn_MAP_Everything_tag2el_1,
+	.tag2el_count = 10,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	-1,	/* Start extensions */
 	-1	/* Stop extensions */
@@ -291,8 +291,8 @@
 	offsetof(struct Choice1, _asn_ctx),
 	offsetof(struct Choice1, present),
 	sizeof(((struct Choice1 *)0)->present),
-	asn_MAP_Choice1_tag2el_1,
-	2,	/* Count of tags in the map */
+	.tag2el = asn_MAP_Choice1_tag2el_1,
+	.tag2el_count = 2,	/* Count of tags in the map */
 	.canonical_order = 0,
 	.ext_start = 1	/* Extensions start */
 };
@@ -403,8 +403,8 @@
 	offsetof(struct Choice2, _asn_ctx),
 	offsetof(struct Choice2, present),
 	sizeof(((struct Choice2 *)0)->present),
-	asn_MAP_Choice2_tag2el_1,
-	2,	/* Count of tags in the map */
+	.tag2el = asn_MAP_Choice2_tag2el_1,
+	.tag2el_count = 2,	/* Count of tags in the map */
 	.canonical_order = 0,
 	.ext_start = 1	/* Extensions start */
 };
@@ -515,8 +515,8 @@
 static asn_SEQUENCE_specifics_t asn_SPC_a_specs_2 = {
 	sizeof(struct a),
 	offsetof(struct a, _asn_ctx),
-	asn_MAP_a_tag2el_2,
-	1,	/* Count of tags in the map */
+	.tag2el = asn_MAP_a_tag2el_2,
+	.tag2el_count = 1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	-1,	/* Start extensions */
 	-1	/* Stop extensions */
@@ -644,8 +644,8 @@
 	offsetof(struct Choice3, _asn_ctx),
 	offsetof(struct Choice3, present),
 	sizeof(((struct Choice3 *)0)->present),
-	asn_MAP_Choice3_tag2el_1,
-	3,	/* Count of tags in the map */
+	.tag2el = asn_MAP_Choice3_tag2el_1,
+	.tag2el_count = 3,	/* Count of tags in the map */
 	.canonical_order = 0,
 	.ext_start = -1	/* Extensions start */
 };
@@ -796,8 +796,8 @@
 static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
 	sizeof(struct Member),
 	offsetof(struct Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	5,	/* Count of tags in the map */
+	.tag2el = asn_MAP_Member_tag2el_2,
+	.tag2el_count = 5,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	3,	/* Start extensions */
 	6	/* Stop extensions */
@@ -976,8 +976,8 @@
 asn_SEQUENCE_specifics_t asn_SPC_Sequence_specs_1 = {
 	sizeof(struct Sequence),
 	offsetof(struct Sequence, _asn_ctx),
-	asn_MAP_Sequence_tag2el_1,
-	4,	/* Count of tags in the map */
+	.tag2el = asn_MAP_Sequence_tag2el_1,
+	.tag2el_count = 4,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	1,	/* Start extensions */
 	5	/* Stop extensions */
@@ -1127,8 +1127,8 @@
 static asn_SEQUENCE_specifics_t asn_SPC_b_specs_3 = {
 	sizeof(struct b),
 	offsetof(struct b, _asn_ctx),
-	asn_MAP_b_tag2el_3,
-	1,	/* Count of tags in the map */
+	.tag2el = asn_MAP_b_tag2el_3,
+	.tag2el_count = 1,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	-1,	/* Start extensions */
 	-1	/* Stop extensions */
@@ -1195,8 +1195,8 @@
 asn_SEQUENCE_specifics_t asn_SPC_Alpha_specs_1 = {
 	sizeof(struct Alpha),
 	offsetof(struct Alpha, _asn_ctx),
-	asn_MAP_Alpha_tag2el_1,
-	2,	/* Count of tags in the map */
+	.tag2el = asn_MAP_Alpha_tag2el_1,
+	.tag2el_count = 2,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	-1,	/* Start extensions */
 	-1	/* Stop extensions */
@@ -1295,8 +1295,8 @@
 asn_SEQUENCE_specifics_t asn_SPC_Beta_specs_1 = {
 	sizeof(struct Beta),
 	offsetof(struct Beta, _asn_ctx),
-	asn_MAP_Beta_tag2el_1,
-	2,	/* Count of tags in the map */
+	.tag2el = asn_MAP_Beta_tag2el_1,
+	.tag2el_count = 2,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	-1,	/* Start extensions */
 	-1	/* Stop extensions */
@@ -1410,8 +1410,8 @@
 asn_SEQUENCE_specifics_t asn_SPC_Gamma_specs_1 = {
 	sizeof(struct Gamma),
 	offsetof(struct Gamma, _asn_ctx),
-	asn_MAP_Gamma_tag2el_1,
-	3,	/* Count of tags in the map */
+	.tag2el = asn_MAP_Gamma_tag2el_1,
+	.tag2el_count = 3,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	-1,	/* Start extensions */
 	-1	/* Stop extensions */
@@ -1513,8 +1513,8 @@
 	sizeof(struct OneTwo),
 	offsetof(struct OneTwo, _asn_ctx),
 	offsetof(struct OneTwo, _presence_map),
-	asn_MAP_OneTwo_tag2el_1,
-	1,	/* Count of tags in the map */
+	.tag2el = asn_MAP_OneTwo_tag2el_1,
+	.tag2el_count = 1,	/* Count of tags in the map */
 	asn_MAP_OneTwo_tag2el_1,	/* Same as above */
 	1,	/* Count of tags in the CXER map */
 	0,	/* Whether extensible */
@@ -1617,8 +1617,8 @@
 	sizeof(struct TwoThree),
 	offsetof(struct TwoThree, _asn_ctx),
 	offsetof(struct TwoThree, _presence_map),
-	asn_MAP_TwoThree_tag2el_1,
-	1,	/* Count of tags in the map */
+	.tag2el = asn_MAP_TwoThree_tag2el_1,
+	.tag2el_count = 1,	/* Count of tags in the map */
 	asn_MAP_TwoThree_tag2el_1,	/* Same as above */
 	1,	/* Count of tags in the CXER map */
 	0,	/* Whether extensible */
@@ -1737,8 +1737,8 @@
 	sizeof(struct ThreeOne),
 	offsetof(struct ThreeOne, _asn_ctx),
 	offsetof(struct ThreeOne, _presence_map),
-	asn_MAP_ThreeOne_tag2el_1,
-	2,	/* Count of tags in the map */
+	.tag2el = asn_MAP_ThreeOne_tag2el_1,
+	.tag2el_count = 2,	/* Count of tags in the map */
 	asn_MAP_ThreeOne_tag2el_1,	/* Same as above */
 	2,	/* Count of tags in the CXER map */
 	0,	/* Whether extensible */