diff --git a/unit/test-stkutil.c b/unit/test-stkutil.c
index ed5ef7b..03e11b6 100644
--- a/unit/test-stkutil.c
+++ b/unit/test-stkutil.c
@@ -4751,22 +4751,23 @@ static struct setup_menu_test setup_menu_data_111 = {
 	.pdu_len = sizeof(setup_menu_111),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 4,
 		.text = "Item 4"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_112 = {
@@ -4774,14 +4775,15 @@ static struct setup_menu_test setup_menu_data_112 = {
 	.pdu_len = sizeof(setup_menu_112),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0x11,
 		.text = "One"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0x12,
 		.text = "Two"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_113 = {
@@ -4795,126 +4797,127 @@ static struct setup_menu_test setup_menu_data_121 = {
 	.pdu_len = sizeof(setup_menu_121),
 	.qualifier = 0x00,
 	.alpha_id = "LargeMenu1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0x50,
 		.text = "Zero"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0x4F,
 		.text = "One"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 0x4E,
 		.text = "Two"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 0x4D,
 		.text = "Three"
 	},
-	.items[4] = {
+	[4] = {
 		.id = 0x4C,
 		.text = "Four"
 	},
-	.items[5] = {
+	[5] = {
 		.id = 0x4B,
 		.text = "Five"
 	},
-	.items[6] = {
+	[6] = {
 		.id = 0x4A,
 		.text = "Six"
 	},
-	.items[7] = {
+	[7] = {
 		.id = 0x49,
 		.text = "Seven"
 	},
-	.items[8] = {
+	[8] = {
 		.id = 0x48,
 		.text = "Eight"
 	},
-	.items[9] = {
+	[9] = {
 		.id = 0x47,
 		.text = "Nine"
 	},
-	.items[10] = {
+	[10] = {
 		.id = 0x46,
 		.text = "Alpha"
 	},
-	.items[11] = {
+	[11] = {
 		.id = 0x45,
 		.text = "Bravo"
 	},
-	.items[12] = {
+	[12] = {
 		.id = 0x44,
 		.text = "Charlie"
 	},
-	.items[13] = {
+	[13] = {
 		.id = 0x43,
 		.text = "Delta"
 	},
-	.items[14] = {
+	[14] = {
 		.id = 0x42,
 		.text = "Echo"
 	},
-	.items[15] = {
+	[15] = {
 		.id = 0x41,
 		.text = "Fox-trot"
 	},
-	.items[16] = {
+	[16] = {
 		.id = 0x40,
 		.text = "Black"
 	},
-	.items[17] = {
+	[17] = {
 		.id = 0x3F,
 		.text = "Brown"
 	},
-	.items[18] = {
+	[18] = {
 		.id = 0x3E,
 		.text = "Red"
 	},
-	.items[19] = {
+	[19] = {
 		.id = 0x3D,
 		.text = "Orange"
 	},
-	.items[20] = {
+	[20] = {
 		.id = 0x3C,
 		.text = "Yellow"
 	},
-	.items[21] = {
+	[21] = {
 		.id = 0x3B,
 		.text = "Green"
 	},
-	.items[22] = {
+	[22] = {
 		.id = 0x3A,
 		.text = "Blue"
 	},
-	.items[23] = {
+	[23] = {
 		.id = 0x39,
 		.text = "Violet"
 	},
-	.items[24] = {
+	[24] = {
 		.id = 0x38,
 		.text = "Grey"
 	},
-	.items[25] = {
+	[25] = {
 		.id = 0x37,
 		.text = "White"
 	},
-	.items[26] = {
+	[26] = {
 		.id = 0x36,
 		.text = "milli"
 	},
-	.items[27] = {
+	[27] = {
 		.id = 0x35,
 		.text = "micro"
 	},
-	.items[28] = {
+	[28] = {
 		.id = 0x34,
 		.text = "nano"
 	},
-	.items[29] = {
+	[29] = {
 		.id = 0x33,
 		.text = "pico"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_122 = {
@@ -4922,34 +4925,35 @@ static struct setup_menu_test setup_menu_data_122 = {
 	.pdu_len = sizeof(setup_menu_122),
 	.qualifier = 0x00,
 	.alpha_id = "LargeMenu2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0xFF,
 		.text = "1 Call Forward Unconditional"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0xFE,
 		.text = "2 Call Forward On User Busy"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 0xFD,
 		.text = "3 Call Forward On No Reply"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 0xFC,
 		.text = "4 Call Forward On User Not Reachable"
 	},
-	.items[4] = {
+	[4] = {
 		.id = 0xFB,
 		.text = "5 Barring Of All Outgoing Calls"
 	},
-	.items[5] = {
+	[5] = {
 		.id = 0xFA,
 		.text = "6 Barring Of All Outgoing Int Calls"
 	},
-	.items[6] = {
+	[6] = {
 		.id = 0xF9,
 		.text = "7 CLI Presentation"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_123 = {
@@ -4961,10 +4965,11 @@ static struct setup_menu_test setup_menu_data_123 = {
 			"facility) in order to give the user the opportunity "
 			"to choose one of these menu items at his own "
 			"discretion. Each item comprises a sh",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0x01,
 		.text = "Y"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_211 = {
@@ -4972,22 +4977,23 @@ static struct setup_menu_test setup_menu_data_211 = {
 	.pdu_len = sizeof(setup_menu_211),
 	.qualifier = 0x80,
 	.alpha_id = "Toolkit Menu",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 4,
 		.text = "Item 4"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_311 = {
@@ -4995,22 +5001,23 @@ static struct setup_menu_test setup_menu_data_311 = {
 	.pdu_len = sizeof(setup_menu_311),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 4,
 		.text = "Item 4"
-	},
+	}},
 	.next_act = {
 		.list = { STK_COMMAND_TYPE_SEND_SMS,
 				STK_COMMAND_TYPE_SETUP_CALL,
@@ -5025,18 +5032,19 @@ static struct setup_menu_test setup_menu_data_411 = {
 	.pdu_len = sizeof(setup_menu_411),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.icon_id = {
 		.qualifier = STK_ICON_QUALIFIER_TYPE_NON_SELF_EXPLANATORY,
 		.id = 1
@@ -5053,18 +5061,19 @@ static struct setup_menu_test setup_menu_data_421 = {
 	.pdu_len = sizeof(setup_menu_421),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.icon_id = {
 		.qualifier = STK_ICON_QUALIFIER_TYPE_SELF_EXPLANATORY,
 		.id = 1
@@ -5081,14 +5090,15 @@ static struct setup_menu_test setup_menu_data_511 = {
 	.pdu_len = sizeof(setup_menu_511),
 	.qualifier = 0x01,
 	.alpha_id = "Toolkit Menu",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_611 = {
@@ -5096,18 +5106,19 @@ static struct setup_menu_test setup_menu_data_611 = {
 	.pdu_len = sizeof(setup_menu_611),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x00, 0xB4 }
@@ -5124,18 +5135,19 @@ static struct setup_menu_test setup_menu_data_612 = {
 	.pdu_len = sizeof(setup_menu_612),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 4,
 		.text = "Item 4"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 5,
 		.text = "Item 5"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 6,
 		.text = "Item 6"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_621 = {
@@ -5143,18 +5155,19 @@ static struct setup_menu_test setup_menu_data_621 = {
 	.pdu_len = sizeof(setup_menu_621),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x01, 0xB4 }
@@ -5171,18 +5184,19 @@ static struct setup_menu_test setup_menu_data_622 = {
 	.pdu_len = sizeof(setup_menu_622),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 4,
 		.text = "Item 4"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 5,
 		.text = "Item 5"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 6,
 		.text = "Item 6"
-	}
+	}}
 };
 
 /*
@@ -5194,18 +5208,19 @@ static struct setup_menu_test setup_menu_data_631 = {
 	.pdu_len = sizeof(setup_menu_631),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x02, 0xB4 }
@@ -5222,18 +5237,19 @@ static struct setup_menu_test setup_menu_data_632 = {
 	.pdu_len = sizeof(setup_menu_632),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 4,
 		.text = "Item 4"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 5,
 		.text = "Item 5"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 6,
 		.text = "Item 6"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_641 = {
@@ -5241,18 +5257,19 @@ static struct setup_menu_test setup_menu_data_641 = {
 	.pdu_len = sizeof(setup_menu_641),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x04, 0xB4 }
@@ -5269,18 +5286,19 @@ static struct setup_menu_test setup_menu_data_642 = {
 	.pdu_len = sizeof(setup_menu_642),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 4,
 		.text = "Item 4"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 5,
 		.text = "Item 5"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 6,
 		.text = "Item 6"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x00, 0xB4 }
@@ -5297,18 +5315,19 @@ static struct setup_menu_test setup_menu_data_643 = {
 	.pdu_len = sizeof(setup_menu_643),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 3",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 7,
 		.text = "Item 7"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 8,
 		.text = "Item 8"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 9,
 		.text = "Item 9"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_651 = {
@@ -5316,18 +5335,19 @@ static struct setup_menu_test setup_menu_data_651 = {
 	.pdu_len = sizeof(setup_menu_651),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x08, 0xB4 }
@@ -5344,18 +5364,19 @@ static struct setup_menu_test setup_menu_data_661 = {
 	.pdu_len = sizeof(setup_menu_661),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x10, 0xB4 }
@@ -5372,18 +5393,19 @@ static struct setup_menu_test setup_menu_data_671 = {
 	.pdu_len = sizeof(setup_menu_671),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x20, 0xB4 }
@@ -5400,18 +5422,19 @@ static struct setup_menu_test setup_menu_data_681 = {
 	.pdu_len = sizeof(setup_menu_681),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x40, 0xB4 }
@@ -5428,18 +5451,19 @@ static struct setup_menu_test setup_menu_data_691 = {
 	.pdu_len = sizeof(setup_menu_691),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0E, 0x80, 0xB4 }
@@ -5456,18 +5480,19 @@ static struct setup_menu_test setup_menu_data_6101 = {
 	.pdu_len = sizeof(setup_menu_6101),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Menu",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x0C, 0x00, 0xB4 }
@@ -5484,22 +5509,23 @@ static struct setup_menu_test setup_menu_data_711 = {
 	.pdu_len = sizeof(setup_menu_711),
 	.qualifier = 0x00,
 	.alpha_id = "ЗДРАВСТВУЙТЕ",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "ЗДРАВСТВУЙТЕ1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "ЗДРАВСТВУЙТЕ2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "ЗДРАВСТВУЙТЕ3"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 4,
 		.text = "ЗДРАВСТВУЙТЕ4"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_712 = {
@@ -5507,14 +5533,15 @@ static struct setup_menu_test setup_menu_data_712 = {
 	.pdu_len = sizeof(setup_menu_712),
 	.qualifier = 0x00,
 	.alpha_id = "ЗДРАВСТВУЙТЕ",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0x11,
 		.text = "ЗДРАВСТВУЙТЕ5"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0x12,
 		.text = "ЗДРАВСТВУЙТЕ6"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_713 = {
@@ -5528,22 +5555,23 @@ static struct setup_menu_test setup_menu_data_811 = {
 	.pdu_len = sizeof(setup_menu_811),
 	.qualifier = 0x00,
 	.alpha_id = "工具箱单",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "项目一"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "项目二"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "项目三"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 4,
 		.text = "项目四"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_812 = {
@@ -5551,14 +5579,15 @@ static struct setup_menu_test setup_menu_data_812 = {
 	.pdu_len = sizeof(setup_menu_812),
 	.qualifier = 0x00,
 	.alpha_id = "工具箱单",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0x11,
 		.text = "一"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0x12,
 		.text = "二"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_813 = {
@@ -5572,22 +5601,23 @@ static struct setup_menu_test setup_menu_data_911 = {
 	.pdu_len = sizeof(setup_menu_911),
 	.qualifier = 0x00,
 	.alpha_id = "80ル0",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "80ル1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "80ル2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "80ル3"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 4,
 		.text = "80ル4"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_912 = {
@@ -5595,14 +5625,15 @@ static struct setup_menu_test setup_menu_data_912 = {
 	.pdu_len = sizeof(setup_menu_912),
 	.qualifier = 0x00,
 	.alpha_id = "80ル0",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0x11,
 		.text = "80ル5"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0x12,
 		.text = "80ル6"
-	}
+	}}
 };
 
 static struct setup_menu_test setup_menu_data_913 = {
@@ -6451,22 +6482,23 @@ static struct select_item_test select_item_data_111 = {
 	.pdu_len = sizeof(select_item_111),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 4,
 		.text = "Item 4"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_121 = {
@@ -6474,126 +6506,127 @@ static struct select_item_test select_item_data_121 = {
 	.pdu_len = sizeof(select_item_121),
 	.qualifier = 0x00,
 	.alpha_id = "LargeMenu1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0x50,
 		.text = "Zero"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0x4F,
 		.text = "One"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 0x4E,
 		.text = "Two"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 0x4D,
 		.text = "Three"
 	},
-	.items[4] = {
+	[4] = {
 		.id = 0x4C,
 		.text = "Four"
 	},
-	.items[5] = {
+	[5] = {
 		.id = 0x4B,
 		.text = "Five"
 	},
-	.items[6] = {
+	[6] = {
 		.id = 0x4A,
 		.text = "Six"
 	},
-	.items[7] = {
+	[7] = {
 		.id = 0x49,
 		.text = "Seven"
 	},
-	.items[8] = {
+	[8] = {
 		.id = 0x48,
 		.text = "Eight"
 	},
-	.items[9] = {
+	[9] = {
 		.id = 0x47,
 		.text = "Nine"
 	},
-	.items[10] = {
+	[10] = {
 		.id = 0x46,
 		.text = "Alpha"
 	},
-	.items[11] = {
+	[11] = {
 		.id = 0x45,
 		.text = "Bravo"
 	},
-	.items[12] = {
+	[12] = {
 		.id = 0x44,
 		.text = "Charlie"
 	},
-	.items[13] = {
+	[13] = {
 		.id = 0x43,
 		.text = "Delta"
 	},
-	.items[14] = {
+	[14] = {
 		.id = 0x42,
 		.text = "Echo"
 	},
-	.items[15] = {
+	[15] = {
 		.id = 0x41,
 		.text = "Fox-trot"
 	},
-	.items[16] = {
+	[16] = {
 		.id = 0x40,
 		.text = "Black"
 	},
-	.items[17] = {
+	[17] = {
 		.id = 0x3F,
 		.text = "Brown"
 	},
-	.items[18] = {
+	[18] = {
 		.id = 0x3E,
 		.text = "Red"
 	},
-	.items[19] = {
+	[19] = {
 		.id = 0x3D,
 		.text = "Orange"
 	},
-	.items[20] = {
+	[20] = {
 		.id = 0x3C,
 		.text = "Yellow"
 	},
-	.items[21] = {
+	[21] = {
 		.id = 0x3B,
 		.text = "Green"
 	},
-	.items[22] = {
+	[22] = {
 		.id = 0x3A,
 		.text = "Blue"
 	},
-	.items[23] = {
+	[23] = {
 		.id = 0x39,
 		.text = "Violet"
 	},
-	.items[24] = {
+	[24] = {
 		.id = 0x38,
 		.text = "Grey"
 	},
-	.items[25] = {
+	[25] = {
 		.id = 0x37,
 		.text = "White"
 	},
-	.items[26] = {
+	[26] = {
 		.id = 0x36,
 		.text = "milli"
 	},
-	.items[27] = {
+	[27] = {
 		.id = 0x35,
 		.text = "micro"
 	},
-	.items[28] = {
+	[28] = {
 		.id = 0x34,
 		.text = "nano"
 	},
-	.items[29] = {
+	[29] = {
 		.id = 0x33,
 		.text = "pico"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_131 = {
@@ -6601,34 +6634,35 @@ static struct select_item_test select_item_data_131 = {
 	.pdu_len = sizeof(select_item_131),
 	.qualifier = 0x00,
 	.alpha_id = "LargeMenu2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0xFF,
 		.text = "Call Forwarding Unconditional"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0xFE,
 		.text = "Call Forwarding On User Busy"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 0xFD,
 		.text = "Call Forwarding On No Reply"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 0xFC,
 		.text = "Call Forwarding On User Not Reachable"
 	},
-	.items[4] = {
+	[4] = {
 		.id = 0xFB,
 		.text = "Barring Of All Outgoing Calls"
 	},
-	.items[5] = {
+	[5] = {
 		.id = 0xFA,
 		.text = "Barring Of All Outgoing International Calls"
 	},
-	.items[6] = {
+	[6] = {
 		.id = 0xF9,
 		.text = "CLI Presentation"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_141 = {
@@ -6636,14 +6670,15 @@ static struct select_item_test select_item_data_141 = {
 	.pdu_len = sizeof(select_item_141),
 	.qualifier = 0x00,
 	.alpha_id = "Select Item",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0x11,
 		.text = "One"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0x12,
 		.text = "Two"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_151 = {
@@ -6654,10 +6689,11 @@ static struct select_item_test select_item_data_151 = {
 		"may choose one. Each item comprises a short identifier (used "
 		"to indicate the selection) and a text string. Optionally the "
 		"SIM may include an alpha identifier. The alpha identifier i",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0x01,
 		.text = "Y"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_161 = {
@@ -6665,34 +6701,35 @@ static struct select_item_test select_item_data_161 = {
 	.pdu_len = sizeof(select_item_161),
 	.qualifier = 0x00,
 	.alpha_id = "0LargeMenu",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 0xFF,
 		.text = "1 Call Forward Unconditional"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 0xFE,
 		.text = "2 Call Forward On User Busy"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 0xFD,
 		.text = "3 Call Forward On No Reply"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 0xFC,
 		.text = "4 Call Forward On User Not Reachable"
 	},
-	.items[4] = {
+	[4] = {
 		.id = 0xFB,
 		.text = "5 Barring Of All Outgoing Calls"
 	},
-	.items[5] = {
+	[5] = {
 		.id = 0xFA,
 		.text = "6 Barring Of All Outgoing Int Calls"
 	},
-	.items[6] = {
+	[6] = {
 		.id = 0xF9,
 		.text = "7 CLI Presentation"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_211 = {
@@ -6700,18 +6737,19 @@ static struct select_item_test select_item_data_211 = {
 	.pdu_len = sizeof(select_item_211),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.next_act = {
 		.list = { STK_COMMAND_TYPE_SEND_SMS,
 				STK_COMMAND_TYPE_SETUP_CALL,
@@ -6725,18 +6763,19 @@ static struct select_item_test select_item_data_311 = {
 	.pdu_len = sizeof(select_item_311),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.item_id = 0x02
 };
 
@@ -6745,18 +6784,19 @@ static struct select_item_test select_item_data_411 = {
 	.pdu_len = sizeof(select_item_411),
 	.qualifier = 0x80,
 	.alpha_id = "Toolkit Select",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_511 = {
@@ -6764,18 +6804,19 @@ static struct select_item_test select_item_data_511 = {
 	.pdu_len = sizeof(select_item_511),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.icon_id = {
 		.qualifier = STK_ICON_QUALIFIER_TYPE_NON_SELF_EXPLANATORY,
 		.id = 1
@@ -6792,18 +6833,19 @@ static struct select_item_test select_item_data_521 = {
 	.pdu_len = sizeof(select_item_521),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	},
+	}},
 	.icon_id = {
 		.qualifier = STK_ICON_QUALIFIER_TYPE_SELF_EXPLANATORY,
 		.id = 1
@@ -6820,18 +6862,19 @@ static struct select_item_test select_item_data_611 = {
 	.pdu_len = sizeof(select_item_611),
 	.qualifier = 0x03,
 	.alpha_id = "Toolkit Select",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_621 = {
@@ -6839,18 +6882,19 @@ static struct select_item_test select_item_data_621 = {
 	.pdu_len = sizeof(select_item_621),
 	.qualifier = 0x01,
 	.alpha_id = "Toolkit Select",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_711 = {
@@ -6858,14 +6902,15 @@ static struct select_item_test select_item_data_711 = {
 	.pdu_len = sizeof(select_item_711),
 	.qualifier = 0x04,
 	.alpha_id = "Toolkit Select",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_811 = {
@@ -6873,18 +6918,19 @@ static struct select_item_test select_item_data_811 = {
 	.pdu_len = sizeof(select_item_811),
 	.qualifier = 0x00,
 	.alpha_id = "<TIME-OUT>",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "Item 3"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_911 = {
@@ -6892,14 +6938,15 @@ static struct select_item_test select_item_data_911 = {
 	.pdu_len = sizeof(select_item_911),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x00, 0xB4 }
@@ -6915,14 +6962,15 @@ static struct select_item_test select_item_data_912 = {
 	.pdu_len = sizeof(select_item_912),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_921 = {
@@ -6930,14 +6978,15 @@ static struct select_item_test select_item_data_921 = {
 	.pdu_len = sizeof(select_item_921),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x01, 0xB4 }
@@ -6953,14 +7002,15 @@ static struct select_item_test select_item_data_922 = {
 	.pdu_len = sizeof(select_item_922),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_931 = {
@@ -6968,14 +7018,15 @@ static struct select_item_test select_item_data_931 = {
 	.pdu_len = sizeof(select_item_931),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x02, 0xB4 }
@@ -6991,14 +7042,15 @@ static struct select_item_test select_item_data_932 = {
 	.pdu_len = sizeof(select_item_932),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_941 = {
@@ -7006,14 +7058,15 @@ static struct select_item_test select_item_data_941 = {
 	.pdu_len = sizeof(select_item_941),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x04, 0xB4 }
@@ -7029,14 +7082,15 @@ static struct select_item_test select_item_data_942 = {
 	.pdu_len = sizeof(select_item_942),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x00, 0xB4 }
@@ -7052,14 +7106,15 @@ static struct select_item_test select_item_data_943 = {
 	.pdu_len = sizeof(select_item_943),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 3",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 5"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 6"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_951 = {
@@ -7067,14 +7122,15 @@ static struct select_item_test select_item_data_951 = {
 	.pdu_len = sizeof(select_item_951),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x08, 0xB4 }
@@ -7090,14 +7146,15 @@ static struct select_item_test select_item_data_952 = {
 	.pdu_len = sizeof(select_item_952),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x00, 0xB4 }
@@ -7113,14 +7170,15 @@ static struct select_item_test select_item_data_953 = {
 	.pdu_len = sizeof(select_item_953),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 3",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 5"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 6"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_961 = {
@@ -7128,14 +7186,15 @@ static struct select_item_test select_item_data_961 = {
 	.pdu_len = sizeof(select_item_961),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x10, 0xB4 }
@@ -7151,14 +7210,15 @@ static struct select_item_test select_item_data_962 = {
 	.pdu_len = sizeof(select_item_962),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x00, 0xB4 }
@@ -7174,14 +7234,15 @@ static struct select_item_test select_item_data_963 = {
 	.pdu_len = sizeof(select_item_963),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 3",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 5"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 6"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_971 = {
@@ -7189,14 +7250,15 @@ static struct select_item_test select_item_data_971 = {
 	.pdu_len = sizeof(select_item_971),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x20, 0xB4 }
@@ -7212,14 +7274,15 @@ static struct select_item_test select_item_data_972 = {
 	.pdu_len = sizeof(select_item_972),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x00, 0xB4 }
@@ -7235,14 +7298,15 @@ static struct select_item_test select_item_data_973 = {
 	.pdu_len = sizeof(select_item_973),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 3",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 5"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 6"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_981 = {
@@ -7250,14 +7314,15 @@ static struct select_item_test select_item_data_981 = {
 	.pdu_len = sizeof(select_item_981),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x40, 0xB4 }
@@ -7273,14 +7338,15 @@ static struct select_item_test select_item_data_982 = {
 	.pdu_len = sizeof(select_item_982),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x00, 0xB4 }
@@ -7296,14 +7362,15 @@ static struct select_item_test select_item_data_983 = {
 	.pdu_len = sizeof(select_item_983),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 3",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 5"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 6"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_991 = {
@@ -7311,14 +7378,15 @@ static struct select_item_test select_item_data_991 = {
 	.pdu_len = sizeof(select_item_991),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x80, 0xB4 }
@@ -7334,14 +7402,15 @@ static struct select_item_test select_item_data_992 = {
 	.pdu_len = sizeof(select_item_992),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x00, 0xB4 }
@@ -7357,14 +7426,15 @@ static struct select_item_test select_item_data_993 = {
 	.pdu_len = sizeof(select_item_993),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 3",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 5"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 6"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_9101 = {
@@ -7372,14 +7442,15 @@ static struct select_item_test select_item_data_9101 = {
 	.pdu_len = sizeof(select_item_9101),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 1",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 2"
-	},
+	}},
 	.text_attr = {
 		.len = 4,
 		.attributes = { 0x00, 0x10, 0x00, 0xB4 }
@@ -7395,14 +7466,15 @@ static struct select_item_test select_item_data_9102 = {
 	.pdu_len = sizeof(select_item_9102),
 	.qualifier = 0x00,
 	.alpha_id = "Toolkit Select 2",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "Item 3"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "Item 4"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_1011 = {
@@ -7410,18 +7482,19 @@ static struct select_item_test select_item_data_1011 = {
 	.pdu_len = sizeof(select_item_1011),
 	.qualifier = 0x00,
 	.alpha_id = "ЗДРАВСТВУЙТЕ",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "ЗДРАВСТВУЙТЕ1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "ЗДРАВСТВУЙТЕ2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "ЗДРАВСТВУЙТЕ3"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_1021 = {
@@ -7429,18 +7502,19 @@ static struct select_item_test select_item_data_1021 = {
 	.pdu_len = sizeof(select_item_1021),
 	.qualifier = 0x00,
 	.alpha_id = "ЗДРАВСТВУЙТЕ",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "ЗДРАВСТВУЙТЕ1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "ЗДРАВСТВУЙТЕ2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "ЗДРАВСТВУЙТЕ3"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_1031 = {
@@ -7448,18 +7522,19 @@ static struct select_item_test select_item_data_1031 = {
 	.pdu_len = sizeof(select_item_1031),
 	.qualifier = 0x00,
 	.alpha_id = "ЗДРАВСТВУЙТЕ",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "ЗДРАВСТВУЙТЕ1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "ЗДРАВСТВУЙТЕ2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "ЗДРАВСТВУЙТЕ3"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_1111 = {
@@ -7467,22 +7542,23 @@ static struct select_item_test select_item_data_1111 = {
 	.pdu_len = sizeof(select_item_1111),
 	.qualifier = 0x00,
 	.alpha_id = "工具箱选择",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "项目一"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "项目二"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "项目三"
 	},
-	.items[3] = {
+	[3] = {
 		.id = 4,
 		.text = "项目四"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_1211 = {
@@ -7490,18 +7566,19 @@ static struct select_item_test select_item_data_1211 = {
 	.pdu_len = sizeof(select_item_1211),
 	.qualifier = 0x00,
 	.alpha_id = "80ル0",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "80ル1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "80ル2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "80ル3"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_1221 = {
@@ -7509,18 +7586,19 @@ static struct select_item_test select_item_data_1221 = {
 	.pdu_len = sizeof(select_item_1221),
 	.qualifier = 0x00,
 	.alpha_id = "81ル0",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "81ル1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "81ル2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "81ル3"
-	}
+	}}
 };
 
 static struct select_item_test select_item_data_1231 = {
@@ -7528,18 +7606,19 @@ static struct select_item_test select_item_data_1231 = {
 	.pdu_len = sizeof(select_item_1231),
 	.qualifier = 0x00,
 	.alpha_id = "82ル0",
-	.items[0] = {
+	.items = {
+	[0] = {
 		.id = 1,
 		.text = "82ル1"
 	},
-	.items[1] = {
+	[1] = {
 		.id = 2,
 		.text = "82ル2"
 	},
-	.items[2] = {
+	[2] = {
 		.id = 3,
 		.text = "82ル3"
-	}
+	}}
 };
 
 static void test_select_item(gconstpointer data)