Fix some of the Errors/warnings detected by checkapi.

svn path=/trunk/; revision=25282

6 files changed, 1342 insertions, 873 deletions

diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c
index 0680d85e8e..c5febbe4b5 100644
--- a/epan/dissectors/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
@@ -359,6 +359,7 @@ static void dissect_options(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *d
 	int i;
 	guint32 p;
 	proto_item *dccp_item = NULL;
+	proto_item *hidden_item;
 
 	while( offset < offset_end ) {
 
@@ -372,7 +373,8 @@ static void dissect_options(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *d
 
 			if(!tvb_bytes_exist(tvb, offset, 1)) {
 				/* DBG("malformed\n"); */
-				proto_tree_add_boolean_hidden(dccp_options_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+				hidden_item = proto_tree_add_boolean(dccp_options_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+				PROTO_ITEM_SET_HIDDEN(hidden_item);
 				THROW(ReportedBoundsError);
 			}
 
@@ -380,13 +382,15 @@ static void dissect_options(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *d
 
 			if (option_len < 2) {
 				/* DBG("malformed\n"); */
-				proto_tree_add_boolean_hidden(dccp_options_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+				hidden_item = proto_tree_add_boolean(dccp_options_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+				PROTO_ITEM_SET_HIDDEN(hidden_item);
 				THROW(ReportedBoundsError);
 			}
 
 			if(!tvb_bytes_exist(tvb, offset, option_len)) {
 				/* DBG("malformed\n"); */
-				proto_tree_add_boolean_hidden(dccp_options_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+				hidden_item = proto_tree_add_boolean(dccp_options_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+				PROTO_ITEM_SET_HIDDEN(hidden_item);
 				THROW(ReportedBoundsError);
 			}
 
@@ -560,6 +564,7 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_tree *dccp_tree = NULL;
 	proto_tree *dccp_options_tree = NULL;
 	proto_item *dccp_item = NULL;
+	proto_item *hidden_item;
 
 	vec_t      cksum_vec[4];
 	guint32    phdr[2];
@@ -574,8 +579,10 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	/* get at least a full message header */
 	if(tvb_length(tvb) < DCCP_HDR_LEN_MIN) {
 		/* DBG("malformed\n"); */
-		if (tree)
-			proto_tree_add_boolean_hidden(dccp_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+		if (tree) {
+			hidden_item = proto_tree_add_boolean(dccp_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+		}
 		if (check_col(pinfo->cinfo, COL_INFO))
 			col_set_str(pinfo->cinfo, COL_INFO, "Packet too short");
 		THROW(ReportedBoundsError);
@@ -624,7 +631,8 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if(dccph->x) {
 		if(tvb_length(tvb) < DCCP_HDR_LEN) { /* at least 16 bytes */
 			/* DBG("malformed\n"); */
-			proto_tree_add_boolean_hidden(dccp_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+			hidden_item = proto_tree_add_boolean(dccp_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 			THROW(ReportedBoundsError);
 		}
 		dccph->reserved2=tvb_get_guint8(tvb, offset+9);
@@ -720,7 +728,8 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 									 offset + 6, 2, dccph->checksum,
 									 "0x%04x [correct]", dccph->checksum);
 				} else {
-					proto_tree_add_boolean_hidden(dccp_tree, hf_dccp_checksum_bad, tvb, offset + 6, 2, TRUE);
+					hidden_item = proto_tree_add_boolean(dccp_tree, hf_dccp_checksum_bad, tvb, offset + 6, 2, TRUE);;
+					PROTO_ITEM_SET_HIDDEN(hidden_item);
 					proto_tree_add_uint_format_value(dccp_tree, hf_dccp_checksum, tvb, offset + 6, 2, dccph->checksum,
 									 "0x%04x [incorrect, should be 0x%04x]", dccph->checksum,
 									 in_cksum_shouldbe(dccph->checksum, computed_cksum));
@@ -938,8 +947,10 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	if(options_len > DCCP_OPT_LEN_MAX) {
 		/* DBG("malformed\n"); */
-		if(tree)
-			proto_tree_add_boolean_hidden(dccp_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+		if(tree) {
+			hidden_item = proto_tree_add_boolean(dccp_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+		}
 		THROW(ReportedBoundsError);
 	}
 
@@ -952,7 +963,8 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			proto_tree_add_text(dccp_tree, tvb, 4, 2,
 					    "bogus data offset, advertised header length (%d) is shorter than expected",
 					    advertised_dccp_header_len);
-			proto_tree_add_boolean_hidden(dccp_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+			hidden_item = proto_tree_add_boolean(dccp_tree, hf_dccp_malformed, tvb, offset, 0, TRUE);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 		}
 		THROW(ReportedBoundsError);
 	} else {
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index e6e101be47..d31dfab6fe 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -11016,6 +11016,7 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length,
 	packet_info *pinfo, proto_tree *tree,
 	guint8 ProtocolAndType, guint8 Service, guint32 FDAAddress)
 {
+	proto_item *hidden_item;
 	guint16 message = 0;
 
 	message = ((guint16)ProtocolAndType) << 8;
@@ -11023,1644 +11024,2055 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length,
 
 	switch(message) {
 		case FDA_MSG_SESSION_OPEN_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_open_sess, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_open_sess_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_open_sess, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_open_sess_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fda_open_sess_req(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case FDA_MSG_SESSION_OPEN_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_open_sess, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_open_sess_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_open_sess, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_open_sess_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fda_open_sess_rsp(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case FDA_MSG_SESSION_OPEN_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_open_sess, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_open_sess_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_open_sess, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_open_sess_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fda_open_sess_err(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case FDA_MSG_SESSION_IDLE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_idle, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_idle_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_idle, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_idle_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fda_idle_req(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case FDA_MSG_SESSION_IDLE_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_idle, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_idle_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_idle, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_idle_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fda_idle_rsp(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case FDA_MSG_SESSION_IDLE_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_idle, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fda_idle_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_idle, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fda_idle_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fda_idle_err(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case SM_MSG_FIND_TAG_QUERY_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_find_tag_query, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_find_tag_query_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_find_tag_query, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_find_tag_query_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_find_tag_query_req(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case SM_MSG_FIND_TAG_REPLY_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_find_tag_reply, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_find_tag_reply_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_find_tag_reply, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_find_tag_reply_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_find_tag_reply_req(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case SM_MSG_IDENTIFY_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_id, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_id_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_id, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_id_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_id_req(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case SM_MSG_IDENTIFY_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_id, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_id_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_id, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_id_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_id_rsp(tvb, offset, length,
 				pinfo, tree, FDAAddress);
 			break;
 
 		case SM_MSG_IDENTIFY_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_id, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_id_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_id, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_id_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_id_err(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case SM_MSG_CLEAR_ADDRESS_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_addr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_addr_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_addr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_addr_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_clear_addr_req(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case SM_MSG_CLEAR_ADDRESS_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_addr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_addr_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_addr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_addr_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_clear_addr_rsp(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case SM_MSG_CLEAR_ADDRESS_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_addr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_addr_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_addr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_addr_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_clear_addr_err(tvb, offset, length,
 				pinfo, tree);
 			break;
 
 		case SM_MSG_SET_ASSIGNMENT_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_set_assign_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_set_assign_info_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_set_assign_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_set_assign_info_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_set_assign_info_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case SM_MSG_SET_ASSIGNMENT_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_set_assign_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_set_assign_info_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_set_assign_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_set_assign_info_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_set_assign_info_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case SM_MSG_SET_ASSIGNMENT_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_set_assign_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_set_assign_info_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_set_assign_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_set_assign_info_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_set_assign_info_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case SM_MSG_CLEAR_ASSIGNMENT_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_assign_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_assign_info_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_assign_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_assign_info_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_clear_assign_info_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case SM_MSG_CLEAR_ASSIGNMENT_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_assign_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_assign_info_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_assign_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_assign_info_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_clear_assign_info_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case SM_MSG_CLEAR_ASSIGNMENT_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_assign_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_clear_assign_info_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_assign_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_clear_assign_info_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_clear_assign_info_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case SM_MSG_DEVICE_ANNUNCIATION_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_dev_annunc, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_sm_dev_annunc_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_dev_annunc, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_sm_dev_annunc_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_sm_dev_annunc_req(tvb, offset,
 				length, pinfo, tree, FDAAddress);
 			break;
 
 		case FMS_MSG_INITIATE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_ABORT_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_abort, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_abort_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_abort, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_abort_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_abort_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_STATUS_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_status, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_status_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_status, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_status_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_status_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_STATUS_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_status, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_status_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_status, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_status_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_status_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_STATUS_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_status, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_status_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_status, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_status_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_status_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_UNSOLICITED_STATUS_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_unsolicited_status, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_unsolicited_status_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_unsolicited_status, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_unsolicited_status_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_unsolicited_status_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_IDENTIFY_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_id, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_id_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_id, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_id_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_id_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_IDENTIFY_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_id, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_id_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_id, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_id_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_id_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_IDENTIFY_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_id, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_id_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_id, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_id_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_id_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GET_OD_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_get_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_get_od_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_get_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_get_od_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_get_od_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GET_OD_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_get_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_get_od_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_get_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_get_od_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_get_od_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GET_OD_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_get_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_get_od_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_get_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_get_od_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_get_od_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_PUT_OD_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_put_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_put_od_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_put_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_put_od_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_put_od_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_PUT_OD_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_put_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_put_od_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_put_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_put_od_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_put_od_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_PUT_OD_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_put_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_put_od_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_put_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_put_od_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_put_od_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_PUT_OD_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_put_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_put_od_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_put_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_put_od_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_put_od_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_PUT_OD_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_put_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_put_od_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_put_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_put_od_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_put_od_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_PUT_OD_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_put_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_put_od_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_put_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_put_od_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_put_od_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_TERMINATE_PUT_OD_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_put_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_put_od_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_put_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_put_od_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_terminate_put_od_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_TERMINATE_PUT_OD_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_put_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_put_od_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_put_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_put_od_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_terminate_put_od_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_TERMINATE_PUT_OD_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_put_od, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_put_od_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_put_od, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_put_od_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_terminate_put_od_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GENERIC_INITIATE_DOWNLOAD_SEQUENCE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_init_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_init_download_seq_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_init_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_init_download_seq_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_generic_init_download_sequence_req(
 				tvb, offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GENERIC_INITIATE_DOWNLOAD_SEQUENCE_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_init_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_init_download_seq_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_init_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_init_download_seq_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_generic_init_download_sequence_rsp(
 				tvb, offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GENERIC_INITIATE_DOWNLOAD_SEQUENCE_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_init_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_init_download_seq_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_init_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_init_download_seq_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_generic_init_download_sequence_err(
 				tvb, offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GENERIC_DOWNLOAD_SEGMENT_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_download_seg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_download_seg_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_download_seg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_download_seg_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_generic_download_segment_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GENERIC_DOWNLOAD_SEGMENT_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_download_seg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_download_seg_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_download_seg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_download_seg_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_generic_download_segment_rsp(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GENERIC_DOWNLOAD_SEGMENT_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_download_seg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_download_seg_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_download_seg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_download_seg_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_generic_download_segment_err(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GENERIC_TERMINATE_DOWNLOAD_SEQUENCE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_terminate_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_terminate_download_seq_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_terminate_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_terminate_download_seq_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_generic_terminate_download_sequence_req(
 				tvb, offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GENERIC_TERMINATE_DOWNLOAD_SEQUENCE_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_terminate_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_terminate_download_seq_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_terminate_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_terminate_download_seq_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_generic_terminate_download_sequence_rsp(
 				tvb, offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_GENERIC_TERMINATE_DOWNLOAD_SEQUENCE_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_terminate_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_gen_terminate_download_seq_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_terminate_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_gen_terminate_download_seq_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_generic_terminate_download_sequence_err(
 				tvb, offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_DOWNLOAD_SEQUENCE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_download_seq_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_download_seq_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_download_sequence_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_DOWNLOAD_SEQUENCE_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_download_seq_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_download_seq_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_download_sequence_rsp(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_DOWNLOAD_SEQUENCE_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_download_seq_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_download_seq_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_download_sequence_err(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DOWNLOAD_SEGMENT_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_download_seg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_download_seg_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_download_seg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_download_seg_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_download_segment_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DOWNLOAD_SEGMENT_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_download_seg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_download_seg_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_download_seg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_download_seg_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_download_segment_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DOWNLOAD_SEGMENT_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_download_seg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_download_seg_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_download_seg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_download_seg_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_download_segment_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_TERMINATE_DOWNLOAD_SEQUENCE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_download_seq_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_download_seq_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_terminate_download_sequence_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_TERMINATE_DOWNLOAD_SEQUENCE_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_download_seq_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_download_seq_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_terminate_download_sequence_rsp(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_TERMINATE_DOWNLOAD_SEQUENCE_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_download_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_download_seq_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_download_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_download_seq_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_terminate_download_sequence_err(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_UPLOAD_SEQUENCE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_upload_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_upload_seq_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_upload_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_upload_seq_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_upload_seq_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_UPLOAD_SEQUENCE_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_upload_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_upload_seq_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_upload_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_upload_seq_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_upload_seq_rsp(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INITIATE_UPLOAD_SEQUENCE_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_upload_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_init_upload_seq_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_upload_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_init_upload_seq_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_init_upload_seq_err(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_UPLOAD_SEGMENT_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_upload_seg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_upload_seg_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_upload_seg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_upload_seg_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_upload_segment_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_UPLOAD_SEGMENT_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_upload_seg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_upload_seg_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_upload_seg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_upload_seg_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_upload_segment_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_UPLOAD_SEGMENT_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_upload_seg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_upload_seg_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_upload_seg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_upload_seg_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_upload_segment_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_TERMINATE_UPLOAD_SEQUENCE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_upload_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_upload_seq_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_upload_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_upload_seq_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_terminate_upload_seq_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_TERMINATE_UPLOAD_SEQUENCE_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_upload_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_upload_seq_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_upload_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_upload_seq_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_terminate_upload_seq_rsp(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_TERMINATE_UPLOAD_SEQUENCE_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_upload_seq, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_terminate_upload_seq_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_upload_seq, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_terminate_upload_seq_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_terminate_upload_seq_err(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_REQUEST_DOMAIN_DOWNLOAD_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_download, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_download_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_download, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_download_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_req_dom_download_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_REQUEST_DOMAIN_DOWNLOAD_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_download, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_download_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_download, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_download_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_req_dom_download_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_REQUEST_DOMAIN_DOWNLOAD_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_download, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_download_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_download, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_download_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_req_dom_download_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_REQUEST_DOMAIN_UPLOAD_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_upload, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_upload_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_upload, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_upload_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_req_dom_upload_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_REQUEST_DOMAIN_UPLOAD_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_upload, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_upload_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_upload, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_upload_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_req_dom_upload_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_REQUEST_DOMAIN_UPLOAD_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_upload, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_req_dom_upload_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_upload, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_req_dom_upload_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_req_dom_upload_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_CREATE_PI_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_create_pi, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_create_pi_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_create_pi, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_create_pi_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_create_pi_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_CREATE_PI_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_create_pi, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_create_pi_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_create_pi, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_create_pi_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_create_pi_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_CREATE_PI_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_create_pi, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_create_pi_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_create_pi, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_create_pi_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_create_pi_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DELETE_PI_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_pi, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_pi_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_pi, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_pi_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_del_pi_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DELETE_PI_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_pi, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_pi_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_pi, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_pi_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_del_pi_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DELETE_PI_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_pi, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_pi_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_pi, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_pi_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_del_pi_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_START_PI_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_start, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_start_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_start, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_start_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_start_pi_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_START_PI_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_start, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_start_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_start, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_start_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_start_pi_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_START_PI_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_start, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_start_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_start, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_start_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_start_pi_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_STOP_PI_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_stop, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_stop_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_stop, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_stop_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_stop_pi_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_STOP_PI_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_stop, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_stop_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_stop, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_stop_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_stop_pi_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_STOP_PI_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_stop, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_stop_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_stop, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_stop_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_stop_pi_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_RESUME_PI_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_resume, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_resume_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_resume, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_resume_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_resume_pi_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_RESUME_PI_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_resume, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_resume_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_resume, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_resume_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_resume_pi_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_RESUME_PI_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_resume, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_resume_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_resume, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_resume_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_resume_pi_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_RESET_PI_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_reset, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_reset_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_reset, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_reset_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_reset_pi_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_RESET_PI_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_reset, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_reset_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_reset, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_reset_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_reset_pi_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_RESET_PI_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_reset, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_reset_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_reset, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_reset_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_reset_pi_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_KILL_PI_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_kill, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_kill_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_kill, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_kill_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_kill_pi_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_KILL_PI_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_kill, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_kill_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_kill, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_kill_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_kill_pi_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_KILL_PI_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_kill, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_kill_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_kill, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_kill_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_kill_pi_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_READ_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_read_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_READ_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_read_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_READ_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_read_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_READ_SUBINDEX_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read_with_subidx, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read_with_subidx_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read_with_subidx, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read_with_subidx_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_read_subindex_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_READ_SUBINDEX_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read_with_subidx, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read_with_subidx_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read_with_subidx, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read_with_subidx_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_read_subindex_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_READ_SUBINDEX_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read_with_subidx, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_read_with_subidx_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read_with_subidx, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_read_with_subidx_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_read_subindex_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_WRITE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_write_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_WRITE_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_write_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_WRITE_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_write_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_WRITE_SUBINDEX_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write_with_subidx, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write_with_subidx_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write_with_subidx, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write_with_subidx_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_write_subindex_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_WRITE_SUBINDEX_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write_with_subidx, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write_with_subidx_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write_with_subidx, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write_with_subidx_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_write_subindex_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_WRITE_SUBINDEX_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write_with_subidx, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_write_with_subidx_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write_with_subidx, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_write_with_subidx_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_write_subindex_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DEFINE_VARIABLE_LIST_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_def_variable_list, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_def_variable_list_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_def_variable_list, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_def_variable_list_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_def_variable_list_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DEFINE_VARIABLE_LIST_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_def_variable_list, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_def_variable_list_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_def_variable_list, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_def_variable_list_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_def_variable_list_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DEFINE_VARIABLE_LIST_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_def_variable_list, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_def_variable_list_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_def_variable_list, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_def_variable_list_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_def_variable_list_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DELETE_VARIABLE_LIST_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_variable_list, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_variable_list_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_variable_list, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_variable_list_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_del_variable_list_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DELETE_VARIABLE_LIST_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_variable_list, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_variable_list_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_variable_list, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_variable_list_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_del_variable_list_rsp(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_DELETE_VARIABLE_LIST_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_variable_list, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_del_variable_list_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_variable_list, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_del_variable_list_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_del_variable_list_err(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INFO_REPORT_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_info_report, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_info_report_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_info_report, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_info_report_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_info_report_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INFO_REPORT_SUBINDEX_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_info_report_with_subidx, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_info_report_with_subidx_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_info_report_with_subidx, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_info_report_with_subidx_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_info_report_subindex_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INFO_REPORT_CHANGE_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_info_report_on_change, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_info_report_on_change_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_info_report_on_change, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_info_report_on_change_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_info_report_change_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_INFO_REPORT_CHANGE_SUBINDEX_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_info_report_on_change_with_subidx, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_info_report_on_change_with_subidx_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_info_report_on_change_with_subidx, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_info_report_on_change_with_subidx_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_info_report_change_subindex_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_EVENT_NOTIFICATION_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_ev_notification, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_ev_notification_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_ev_notification, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_ev_notification_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_ev_notification_req(tvb, offset,
 				length, pinfo, tree);
 			break;
 
 		case FMS_MSG_ALTER_EVENT_CONDITION_MONITORING_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_alter_ev_condition_monitoring, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_alter_ev_condition_monitoring_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_alter_ev_condition_monitoring, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_alter_ev_condition_monitoring_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_req(
 				tvb, offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_ALTER_EVENT_CONDITION_MONITORING_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_alter_ev_condition_monitoring, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_alter_ev_condition_monitoring_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_alter_ev_condition_monitoring, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_alter_ev_condition_monitoring_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_rsp(
 				tvb, offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_ALTER_EVENT_CONDITION_MONITORING_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_alter_ev_condition_monitoring, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_alter_ev_condition_monitoring_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_alter_ev_condition_monitoring, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_alter_ev_condition_monitoring_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err(
 				tvb, offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_ACKNOWLEDGE_EVENT_NOTIFICATION_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_ack_ev_notification, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_ack_ev_notification_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_ack_ev_notification, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_ack_ev_notification_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_ack_ev_notification_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_ACKNOWLEDGE_EVENT_NOTIFICATION_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_ack_ev_notification, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_ack_ev_notification_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_ack_ev_notification, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_ack_ev_notification_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_ack_ev_notification_rsp(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case FMS_MSG_ACKNOWLEDGE_EVENT_NOTIFICATION_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_ack_ev_notification, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_fms_ack_ev_notification_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_ack_ev_notification, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_fms_ack_ev_notification_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_fms_ack_ev_notification_err(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_GET_INFO_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_info_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_info_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_lr_get_info_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_GET_INFO_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_info_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_info_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_lr_get_info_rsp(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_GET_INFO_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_info_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_info_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_lr_get_info_err(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_PUT_INFO_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_put_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_put_info_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_put_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_put_info_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_lr_put_info_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_PUT_INFO_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_put_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_put_info_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_put_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_put_info_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_lr_put_info_rsp(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_PUT_INFO_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_put_info, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_put_info_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_put_info, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_put_info_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_lr_put_info_err(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_GET_STATISTICS_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_statistics, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_statistics_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_statistics, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_statistics_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_lr_get_statistics_req(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_GET_STATISTICS_RSP:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_statistics, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_statistics_rsp, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_statistics, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_statistics_rsp, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_lr_get_statistics_rsp(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_GET_STATISTICS_ERR:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_statistics, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_get_statistics_err, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_statistics, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_get_statistics_err, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_lr_get_statistics_err(tvb,
 				offset, length, pinfo, tree);
 			break;
 
 		case LAN_MSG_DIAG_REQ:
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_diagnostic_msg, tvb, 0, 0, 1);
-			proto_tree_add_boolean_hidden(tree,
-				hf_ff_lr_diagnostic_msg_req, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_diagnostic_msg, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
+			hidden_item = proto_tree_add_boolean(tree,
+					hf_ff_lr_diagnostic_msg_req, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 			dissect_ff_msg_diagnostic_msg_req(tvb,
 				offset, length, pinfo, tree);
@@ -12699,12 +13111,14 @@ dissect_ff_msg_trailer(tvbuff_t *tvb,
 {
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
+	proto_item *hidden_item;
 
 	if(!tree) {
 		return;
 	}
 
-	proto_tree_add_boolean_hidden(tree, hf_ff_fda_msg_trailer, tvb, 0, 0, 1);
+	hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_msg_trailer, tvb, 0, 0, 1);
+	PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 	ti = proto_tree_add_text(tree,
 		tvb, offset, length, "FDA Message Trailer");
@@ -12968,13 +13382,15 @@ dissect_ff_msg_hdr(tvbuff_t *tvb,
 {
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
+	proto_item *hidden_item;
 	gint offset	= 0;
 
 	if(!tree) {
 		return;
 	}
 
-	proto_tree_add_boolean_hidden(tree, hf_ff_fda_msg_hdr, tvb, 0, 0, 1);
+	hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_msg_hdr, tvb, 0, 0, 1);
+	PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 	ti = proto_tree_add_text(tree,
 		tvb, offset, 12, "FDA Message Header");
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index a02fa48ca2..26ed1d30ee 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -528,6 +528,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	const char	*proto_tag;
 	proto_tree	*http_tree = NULL;
 	proto_item	*ti = NULL;
+	proto_item	*hidden_item;
 	const guchar	*line;
 	gint		next_offset;
 	const guchar	*linep, *lineend;
@@ -842,18 +843,21 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		switch (http_type) {
 
 		case HTTP_NOTIFICATION:
-			proto_tree_add_boolean_hidden(http_tree,
-			    hf_http_notification, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(http_tree,
+					    hf_http_notification, tvb, 0, 0, 1);
+                        PROTO_ITEM_SET_HIDDEN(hidden_item);
 			break;
 
 		case HTTP_RESPONSE:
-			proto_tree_add_boolean_hidden(http_tree,
-			    hf_http_response, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(http_tree,
+					    hf_http_response, tvb, 0, 0, 1);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 			break;
 
 		case HTTP_REQUEST:
-			proto_tree_add_boolean_hidden(http_tree,
-			    hf_http_request, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(http_tree,
+					    hf_http_request, tvb, 0, 0, 1);
+                        PROTO_ITEM_SET_HIDDEN(hidden_item);
 			break;
 
 		case HTTP_OTHERS:
diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c
index e9b23da6a6..8653df54be 100644
--- a/epan/dissectors/packet-icap.c
+++ b/epan/dissectors/packet-icap.c
@@ -62,6 +62,7 @@ dissect_icap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	proto_tree	*icap_tree = NULL;
 	proto_item	*ti = NULL;
+	proto_item	*hidden_item;
 	gint		offset = 0;
 	const guchar	*line;
 	gint		next_offset;
@@ -231,23 +232,27 @@ is_icap_header:
 		switch (icap_type) {
 
 		case ICAP_OPTIONS:
-			proto_tree_add_boolean_hidden(icap_tree,
-			    hf_icap_options, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(icap_tree,
+					    hf_icap_options, tvb, 0, 0, 1);
+                        PROTO_ITEM_SET_HIDDEN(hidden_item);
 			break;
 
 		case ICAP_REQMOD:
-			proto_tree_add_boolean_hidden(icap_tree,
-			    hf_icap_reqmod, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(icap_tree,
+					    hf_icap_reqmod, tvb, 0, 0, 1);
+                        PROTO_ITEM_SET_HIDDEN(hidden_item);
 			break;
 
 		case ICAP_RESPMOD:
-			proto_tree_add_boolean_hidden(icap_tree,
-			    hf_icap_respmod, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(icap_tree,
+					    hf_icap_respmod, tvb, 0, 0, 1);
+                        PROTO_ITEM_SET_HIDDEN(hidden_item);
 			break;
 
 		case ICAP_RESPONSE:
-			proto_tree_add_boolean_hidden(icap_tree,
-			    hf_icap_response, tvb, 0, 0, 1);
+			hidden_item = proto_tree_add_boolean(icap_tree,
+					    hf_icap_response, tvb, 0, 0, 1);
+                        PROTO_ITEM_SET_HIDDEN(hidden_item);
 			break;
 
 		case ICAP_OTHER:
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index c9abd782ce..c786bc65f3 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -2017,11 +2017,13 @@ static void
 dissect_tcpopt_maxseg(const ip_tcp_opt *optp, tvbuff_t *tvb,
     int offset, guint optlen, packet_info *pinfo, proto_tree *opt_tree)
 {
+  proto_item *hidden_item;
   guint16 mss;
 
   mss = tvb_get_ntohs(tvb, offset + 2);
-  proto_tree_add_boolean_hidden(opt_tree, hf_tcp_option_mss, tvb, offset,
+  hidden_item = proto_tree_add_boolean(opt_tree, hf_tcp_option_mss, tvb, offset,
 				optlen, TRUE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   proto_tree_add_uint_format(opt_tree, hf_tcp_option_mss_val, tvb, offset,
 			     optlen, mss, "%s: %u bytes", optp->name, mss);
   tcp_info_append_uint(pinfo, "MSS", mss);
@@ -2031,14 +2033,16 @@ static void
 dissect_tcpopt_wscale(const ip_tcp_opt *optp, tvbuff_t *tvb,
     int offset, guint optlen, packet_info *pinfo, proto_tree *opt_tree)
 {
+  proto_item *hidden_item;
   guint8 ws;
   struct tcp_analysis *tcpd=NULL;
 
   tcpd=get_tcp_conversation_data(pinfo);
 
   ws = tvb_get_guint8(tvb, offset + 2);
-  proto_tree_add_boolean_hidden(opt_tree, hf_tcp_option_wscale, tvb,
+  hidden_item = proto_tree_add_boolean(opt_tree, hf_tcp_option_wscale, tvb,
 				offset, optlen, TRUE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   proto_tree_add_uint_format(opt_tree, hf_tcp_option_wscale_val, tvb,
 			     offset, optlen, ws, "%s: %u (multiply by %u)",
 			     optp->name, ws, 1 << ws);
@@ -2054,6 +2058,7 @@ dissect_tcpopt_sack(const ip_tcp_opt *optp, tvbuff_t *tvb,
 {
   proto_tree *field_tree = NULL;
   proto_item *tf=NULL;
+  proto_item *hidden_item;
   guint32 leftedge, rightedge;
   struct tcp_analysis *tcpd=NULL;
   guint32 base_ack=0;
@@ -2074,8 +2079,9 @@ dissect_tcpopt_sack(const ip_tcp_opt *optp, tvbuff_t *tvb,
     if (field_tree == NULL) {
       /* Haven't yet made a subtree out of this option.  Do so. */
       field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
-      proto_tree_add_boolean_hidden(field_tree, hf_tcp_option_sack, tvb,
+      hidden_item = proto_tree_add_boolean(field_tree, hf_tcp_option_sack, tvb,
 				    offset, optlen, TRUE);
+      PROTO_ITEM_SET_HIDDEN(hidden_item);
     }
     if (optlen < 4) {
       proto_tree_add_text(field_tree, tvb, offset,      optlen,
@@ -2112,11 +2118,13 @@ static void
 dissect_tcpopt_echo(const ip_tcp_opt *optp, tvbuff_t *tvb,
     int offset, guint optlen, packet_info *pinfo, proto_tree *opt_tree)
 {
+  proto_item *hidden_item;
   guint32 echo;
 
   echo = tvb_get_ntohl(tvb, offset + 2);
-  proto_tree_add_boolean_hidden(opt_tree, hf_tcp_option_echo, tvb, offset,
+  hidden_item = proto_tree_add_boolean(opt_tree, hf_tcp_option_echo, tvb, offset,
 				optlen, TRUE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   proto_tree_add_text(opt_tree, tvb, offset,      optlen,
 			"%s: %u", optp->name, echo);
   tcp_info_append_uint(pinfo, "ECHO", echo);
@@ -2126,12 +2134,14 @@ static void
 dissect_tcpopt_timestamp(const ip_tcp_opt *optp, tvbuff_t *tvb,
     int offset, guint optlen, packet_info *pinfo, proto_tree *opt_tree)
 {
+  proto_item *hidden_item;
   guint32 tsv, tser;
 
   tsv = tvb_get_ntohl(tvb, offset + 2);
   tser = tvb_get_ntohl(tvb, offset + 6);
-  proto_tree_add_boolean_hidden(opt_tree, hf_tcp_option_time_stamp, tvb,
+  hidden_item = proto_tree_add_boolean(opt_tree, hf_tcp_option_time_stamp, tvb,
 				offset, optlen, TRUE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   proto_tree_add_text(opt_tree, tvb, offset,      optlen,
     "%s: TSval %u, TSecr %u", optp->name, tsv, tser);
   tcp_info_append_uint(pinfo, "TSV", tsv);
@@ -2142,11 +2152,13 @@ static void
 dissect_tcpopt_cc(const ip_tcp_opt *optp, tvbuff_t *tvb,
     int offset, guint optlen, packet_info *pinfo, proto_tree *opt_tree)
 {
+  proto_item *hidden_item;
   guint32 cc;
 
   cc = tvb_get_ntohl(tvb, offset + 2);
-  proto_tree_add_boolean_hidden(opt_tree, hf_tcp_option_cc, tvb, offset,
+  hidden_item = proto_tree_add_boolean(opt_tree, hf_tcp_option_cc, tvb, offset,
 				optlen, TRUE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   proto_tree_add_text(opt_tree, tvb, offset,      optlen,
 			"%s: %u", optp->name, cc);
   tcp_info_append_uint(pinfo, "CC", cc);
@@ -2176,11 +2188,13 @@ dissect_tcpopt_qs(const ip_tcp_opt *optp, tvbuff_t *tvb,
     {15, "1.31072 Gbit/s"},
     {0, NULL}
   };
+  proto_item *hidden_item;
 
   guint8 rate = tvb_get_guint8(tvb, offset + 2) & 0x0f;
 
-  proto_tree_add_boolean_hidden(opt_tree, hf_tcp_option_qs, tvb, offset,
+  hidden_item = proto_tree_add_boolean(opt_tree, hf_tcp_option_qs, tvb, offset,
 				optlen, TRUE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   proto_tree_add_text(opt_tree, tvb, offset,      optlen,
 		      "%s: Rate response, %s, TTL diff %u ", optp->name,
 		      val_to_str(rate, qs_rates, "Unknown"),
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index 5bfb3cf04f..04ac945420 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -244,6 +244,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	proto_tree *tree, proto_tree *tns_tree)
 {
 	proto_tree *data_tree = NULL, *ti;
+	proto_item *hidden_item;
 	int is_sns = 0;
 
 	if ( tvb_bytes_exist(tvb, offset+2, 4) )
@@ -271,8 +272,9 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		}
 		data_tree = proto_item_add_subtree(ti, ett_tns_data);
 
-		proto_tree_add_boolean_hidden(tns_tree, hf_tns_data, tvb, 0, 0,
-				TRUE);
+		hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_data, tvb, 0, 0,
+					TRUE);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 	}
 
 	if ( tree )
@@ -319,6 +321,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	proto_tree *tree, proto_tree *tns_tree)
 {
 	proto_tree *connect_tree = NULL, *ti;
+	proto_item *hidden_item;
 	int cd_offset;
 	int cd_len;
 	int tns_offset = offset-8;
@@ -329,8 +332,9 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		    "Connect");
 		connect_tree = proto_item_add_subtree(ti, ett_tns_connect);
 
-		proto_tree_add_boolean_hidden(tns_tree, hf_tns_connect, tvb,
-		    0, 0, TRUE);
+		hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_connect, tvb,
+				    0, 0, TRUE);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 	}
 
 	if ( check_col(pinfo->cinfo, COL_INFO) )
@@ -512,6 +516,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	proto_tree *tree, proto_tree *tns_tree)
 {
 	proto_tree *accept_tree = NULL, *ti;
+	proto_item *hidden_item;
 	int accept_offset;
 	int accept_len;
 	int tns_offset = offset-8;
@@ -522,8 +527,9 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		    "Accept");
 		accept_tree = proto_item_add_subtree(ti, ett_tns_accept);
 
-		proto_tree_add_boolean_hidden(tns_tree, hf_tns_accept, tvb,
-		    0, 0, TRUE);
+		hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_accept, tvb,
+				    0, 0, TRUE);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 	}
 
 	if ( check_col(pinfo->cinfo, COL_INFO) )
@@ -630,6 +636,7 @@ static void dissect_tns_refuse(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	proto_tree *tree, proto_tree *tns_tree)
 {
 	proto_tree *refuse_tree = NULL, *ti;
+	proto_item *hidden_item;
 
 	if ( tree )
 	{
@@ -637,8 +644,9 @@ static void dissect_tns_refuse(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		    "Refuse");
 		refuse_tree = proto_item_add_subtree(ti, ett_tns_refuse);
 
-		proto_tree_add_boolean_hidden(tns_tree, hf_tns_refuse, tvb,
-		    0, 0, TRUE);
+		hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_refuse, tvb,
+				    0, 0, TRUE);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 	}
 
 	if ( check_col(pinfo->cinfo, COL_INFO) )
@@ -680,6 +688,7 @@ static void dissect_tns_abort(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	proto_tree *tree, proto_tree *tns_tree)
 {
 	proto_tree *abort_tree = NULL, *ti;
+	proto_item *hidden_item;
 
 	if ( tree )
 	{
@@ -687,8 +696,9 @@ static void dissect_tns_abort(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		    "Abort");
 		abort_tree = proto_item_add_subtree(ti, ett_tns_abort);
 
-		proto_tree_add_boolean_hidden(tns_tree, hf_tns_abort, tvb,
-		    0, 0, TRUE);
+		hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_abort, tvb,
+				    0, 0, TRUE);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 	}
 
 	if ( check_col(pinfo->cinfo, COL_INFO) )
@@ -723,6 +733,7 @@ static void dissect_tns_marker(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	proto_tree *tree, proto_tree *tns_tree, int is_attention)
 {
 	proto_tree *marker_tree = NULL, *ti;
+	proto_item *hidden_item;
 
 	if ( tree )
 	{
@@ -738,8 +749,9 @@ static void dissect_tns_marker(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		}
 
 		marker_tree = proto_item_add_subtree(ti, ett_tns_marker);
-		proto_tree_add_boolean_hidden(tns_tree, hf_tns_marker, tvb,
-		    0, 0, TRUE);
+		hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_marker, tvb,
+				    0, 0, TRUE);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 	}
 
 	if ( check_col(pinfo->cinfo, COL_INFO) )
@@ -782,6 +794,7 @@ static void dissect_tns_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	proto_tree *tree, proto_tree *tns_tree)
 {
 	proto_tree *redirect_tree = NULL, *ti;
+	proto_item *hidden_item;
 
 	if ( tree )
 	{
@@ -789,8 +802,9 @@ static void dissect_tns_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		    "Redirect");
 		redirect_tree = proto_item_add_subtree(ti, ett_tns_redirect);
 
-		proto_tree_add_boolean_hidden(tns_tree, hf_tns_redirect, tvb,
-		    0, 0, TRUE);
+		hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_redirect, tvb,
+				    0, 0, TRUE);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 	}
 
 	if ( check_col(pinfo->cinfo, COL_INFO) )
@@ -817,6 +831,7 @@ static void dissect_tns_control(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	proto_tree *tree, proto_tree *tns_tree)
 {
 	proto_tree *control_tree = NULL, *ti;
+	proto_item *hidden_item;
 
 	if ( tree )
 	{
@@ -824,8 +839,9 @@ static void dissect_tns_control(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		    "Control");
 		control_tree = proto_item_add_subtree(ti, ett_tns_control);
 
-		proto_tree_add_boolean_hidden(tns_tree, hf_tns_control, tvb,
-		    0, 0, TRUE);
+		hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_control, tvb,
+				    0, 0, TRUE);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 	}
 
 	if ( check_col(pinfo->cinfo, COL_INFO) )
@@ -885,6 +901,7 @@ static void
 dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	proto_tree      *tns_tree = NULL, *ti;
+	proto_item *hidden_item;
 	int offset = 0;
 	guint16 length;
 	guint16 type;
@@ -910,8 +927,9 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		}
 		else
 		{
-			proto_tree_add_boolean_hidden(tns_tree, hf_tns_response,
-			    tvb, offset, 0, TRUE);
+			hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_response,
+					    tvb, offset, 0, TRUE);
+			PROTO_ITEM_SET_HIDDEN(hidden_item);
 		}
 	}