Get rid of check_col, while at it set ENC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39164 f5534014-38df-0310-8fa8-9805f1628bb7

22 files changed, 414 insertions, 605 deletions

diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c
index 67340a0e4e..5fc1f87662 100644
--- a/asn1/q932/packet-q932-template.c
+++ b/asn1/q932/packet-q932-template.c
@@ -134,7 +134,7 @@ dissect_q932_facility_ie(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
   tvbuff_t *next_tvb;
 
   ie_end = offset + length;
-  proto_tree_add_item(tree, hf_q932_pp, tvb, offset, 1, FALSE);
+  proto_tree_add_item(tree, hf_q932_pp, tvb, offset, 1, ENC_BIG_ENDIAN);
   offset++;
   while (offset < ie_end) {
     hoffset = offset;
@@ -235,7 +235,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   offset = 0;
 
-  ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, FALSE);
+  ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, ENC_NA);
   PROTO_ITEM_SET_HIDDEN(ti);
 
   ie_type = tvb_get_guint8(tvb, offset);
@@ -244,8 +244,8 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   ti_ie = proto_tree_add_text(tree, tvb, offset, -1, "%s",
             val_to_str(ie_type, VALS(q932_str_ie_type), "unknown (0x%02X)"));
   ie_tree = proto_item_add_subtree(ti_ie, ett_q932_ie); 
-  proto_tree_add_item(ie_tree, hf_q932_ie_type, tvb, offset, 1, FALSE);
-  proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, FALSE);
+  proto_tree_add_item(ie_tree, hf_q932_ie_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+  proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
   offset += 2;
   if (tvb_length_remaining(tvb, offset) <= 0)
     return;
@@ -258,7 +258,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
       break;
     default:
       if (ie_len > 0) {
-        if (tree) proto_tree_add_item(ie_tree, hf_q932_ie_data, tvb, offset, ie_len, FALSE);
+        if (tree) proto_tree_add_item(ie_tree, hf_q932_ie_data, tvb, offset, ie_len, ENC_NA);
       }
   }
 }
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index ee34f4f5e6..62cddff8ac 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -123,7 +123,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "RNSAP");
 
 	/* create the rnsap protocol tree */
-	rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, FALSE);
+	rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, ENC_NA);
 	rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap);
 	
 	dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree);
diff --git a/asn1/rnsap/rnsap.cnf b/asn1/rnsap/rnsap.cnf
index 16f842ac1f..4447dc1ccc 100644
--- a/asn1/rnsap/rnsap.cnf
+++ b/asn1/rnsap/rnsap.cnf
@@ -74,10 +74,9 @@ ProtocolIE-ContainerPairList
 
 #.FN_PARS  ProcedureCode  VAL_PTR = &ProcedureCode
 #.FN_FTR ProcedureCode
-	if (check_col(actx->pinfo->cinfo, COL_INFO))
-       col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
-                   val_to_str_ext_const(ProcedureCode, &rnsap_ProcedureCode_vals_ext,
-                              "unknown message"));
+   col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
+                val_to_str_ext_const(ProcedureCode, &rnsap_ProcedureCode_vals_ext,
+                           "unknown message"));
 #.END
 #.FN_PARS ProcedureID/ddMode VAL_PTR = &ddMode
 
diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf
index d6a3577bcd..b9561b3c4c 100644
--- a/asn1/rtse/rtse.cnf
+++ b/asn1/rtse/rtse.cnf
@@ -98,7 +98,7 @@ RTABapdu
   offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index, &app_proto);
 
 #.FN_BODY SessionConnectionIdentifier
-  if(open_request && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request)
     col_append_str(actx->pinfo->cinfo, COL_INFO, "Recover");
   %(DEFAULT_BODY)s
 
@@ -107,7 +107,7 @@ RTABapdu
 #.FN_BODY CallingSSuserReference/t61String  VAL_PTR=&string
   tvbuff_t *string = NULL;
   %(DEFAULT_BODY)s
-  if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request && string)
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(string, 0, tvb_length(string)));
 
 #.FN_PARS CommonReference
@@ -115,7 +115,7 @@ RTABapdu
 #.FN_BODY CommonReference
   tvbuff_t *string = NULL;
   %(DEFAULT_BODY)s
-  if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request && string)
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(string, 0, tvb_length(string)));
 
 #.END
@@ -123,7 +123,7 @@ RTABapdu
 #.FN_BODY CallingSSuserReference/octetString  VAL_PTR=&string
   tvbuff_t *string = NULL;
   %(DEFAULT_BODY)s
-  if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request && string)
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(string, 0, tvb_length(string)));
 
 #.FN_BODY RTTPapdu  VAL_PTR=&priority
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
index 6878a3ec26..ed91180cd4 100644
--- a/asn1/t38/packet-t38-template.c
+++ b/asn1/t38/packet-t38-template.c
@@ -381,8 +381,7 @@ force_reassemble_seq(packet_info *pinfo, guint32 id,
 	fd_head->flags |= FD_DEFRAGMENTED;
 	fd_head->reassembled_in=pinfo->fd->num;
 
-	if (check_col(pinfo->cinfo, COL_INFO))
-			col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost);
+	col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost);
 	
 	p_t38_packet_conv_info->packet_lost = packet_lost;
 	p_t38_packet_conv_info->burst_lost = burst_lost;
@@ -590,11 +589,8 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				}
 				col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]");
 				break;
-			} 
-			else {
-				if (check_col(pinfo->cinfo, COL_INFO)){
-					col_append_fstr(pinfo->cinfo, COL_INFO, " IFPPacket#%u",ifp_packet_number);
-				}
+			}else {
+				col_append_fstr(pinfo->cinfo, COL_INFO, " IFPPacket#%u",ifp_packet_number);
 			}
 		}
 	}
diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf
index 80f9f4a96a..ae82680e38 100644
--- a/asn1/t38/t38.cnf
+++ b/asn1/t38/t38.cnf
@@ -28,7 +28,7 @@ UDPTLPacket
 
 #.FN_PARS Type-of-msg/t30-indicator  VAL_PTR=&T30ind_value
 #.FN_FTR Type-of-msg/t30-indicator
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " t30ind: %s",
          val_to_str(T30ind_value,t38_T30_indicator_vals,"<unknown>"));
     }
@@ -40,7 +40,7 @@ UDPTLPacket
 
 #.FN_PARS Type-of-msg/t30-data  VAL_PTR=&Data_value
 #.FN_FTR Type-of-msg/t30-data
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " data:%s:",
          val_to_str(Data_value,t38_T30_data_vals,"<unknown>"));
     }
@@ -60,7 +60,7 @@ EXT=(use_pre_corrigendum_asn1_specification)?FALSE:TRUE
 EXT_NUM=(use_pre_corrigendum_asn1_specification)?0:4
 VAL_PTR=&Data_Field_field_type_value
 #.FN_FTR Data-Field/_item/field-type
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s",
          val_to_str(Data_Field_field_type_value,t38_T_field_type_vals,"<unknown>"));
     }
@@ -156,7 +156,7 @@ VAL_PTR=&Data_Field_field_type_value
     value_len = tvb_length(value_tvb);
 
 #.FN_FTR Data-Field/_item/field-data
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         if(value_len < 8){
             col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]",
                tvb_bytes_to_str(value_tvb,0,value_len));
@@ -204,11 +204,9 @@ VAL_PTR=&Data_Field_field_type_value
 
             if (!frag_msg) { /* Not last packet of reassembled */
                 if (Data_Field_field_type_value == 0) {
-                    if (check_col(actx->pinfo->cinfo, COL_INFO))
-                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                    col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
                 } else {
-                    if (check_col(actx->pinfo->cinfo, COL_INFO))
-                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                    col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
                 }
             }
 
@@ -230,9 +228,7 @@ VAL_PTR=&Data_Field_field_type_value
     if (primary_part)
         t38_info->seq_num = seq_number;
 
-      if (check_col(actx->pinfo->cinfo, COL_INFO)){
-        col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number);
-    }
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number);
 #.END
 
 #.FN_HDR UDPTLPacket/primary-ifp-packet
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index 673cf092f5..5034d15d1a 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -204,7 +204,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
     /* create display subtree for the protocol */
     if(parent_tree){
-      item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, FALSE);
+      item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, ENC_NA);
       tree = proto_item_add_subtree(item, ett_tcap);
       tcap_stat_tree=tree;
     }
diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf
index d0d39c28e0..74b9f06ccd 100644
--- a/asn1/tcap/tcap.cnf
+++ b/asn1/tcap/tcap.cnf
@@ -141,7 +141,7 @@ if (parameter_tvb){
 		break;
 	}
 
-	if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
+	if (len){
 		col_append_str(actx->pinfo->cinfo, COL_INFO, "otid(");
 	   	for(i=0;i<len;i++)
         		  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%02x",tvb_get_guint8(parameter_tvb,i));
@@ -180,7 +180,7 @@ if (parameter_tvb){
 		break;
 	}
 
-	if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
+	if (len){
 		col_append_str(actx->pinfo->cinfo, COL_INFO, "dtid(");
 		for(i=0;i<len;i++)
           		col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%02x",tvb_get_guint8(parameter_tvb,i));
@@ -197,30 +197,26 @@ gp_tcapsrt_info->ope=TC_BEGIN;
  *  If there's something there that should not be overwritten, whoever
  *  put that info there should call col_set_fence() to protect it.
  */
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
 #.END
 
 
 #.FN_HDR End
 gp_tcapsrt_info->ope=TC_END;
 
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "End ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "End ");
 #.END
 
 
 #.FN_HDR Continue
 gp_tcapsrt_info->ope=TC_CONT;
 
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
 #.END
 
 
 #.FN_HDR Abort
 gp_tcapsrt_info->ope=TC_ABORT;
 
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
 #.END
diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c
index 0fde816511..ff04cbed83 100644
--- a/asn1/tetra/packet-tetra-template.c
+++ b/asn1/tetra/packet-tetra-template.c
@@ -223,7 +223,7 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre
 	guint8 p;
 
 	tetra_sub_item = proto_tree_add_item(tree, hf_tetra_pdu,
-					     pdu, 0, tvb_length(pdu), FALSE);
+					     pdu, 0, tvb_length(pdu), ENC_NA);
 
 	tetra_sub_tree = proto_item_add_subtree(tetra_sub_item, ett_tetra);
 
@@ -484,7 +484,7 @@ dissect_tetra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		guint32 txtimer = 0;
 		guint32 tslot = 0;
 
-		tetra_item = proto_tree_add_item(tree, proto_tetra, tvb, 0, -1, FALSE);
+		tetra_item = proto_tree_add_item(tree, proto_tetra, tvb, 0, -1, ENC_NA);
 		tetra_tree = proto_item_add_subtree(tetra_item, ett_tetra);
 		tetra_header_tree = proto_item_add_subtree(tetra_item, ett_tetra);
 
diff --git a/asn1/tetra/tetra.cnf b/asn1/tetra/tetra.cnf
index c79d8bc8a4..9cf757bc30 100644
--- a/asn1/tetra/tetra.cnf
+++ b/asn1/tetra/tetra.cnf
@@ -68,267 +68,194 @@ BNCH
 
 #.FN_BODY U-RELEASE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
 #.END
 
 #.FN_BODY D-RELEASE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
 #.END
 
 
 
 #.FN_BODY D-CALL-PROCEEDING
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-PROCEEDING");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-PROCEEDING");
 #.END
 
 #.FN_BODY D-SETUP
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SETUP");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SETUP");
 #.END
 
 
 #.FN_BODY U-LOCATION-UPDATE-DEMAND
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-LOCATION-UPDATE-DEMAND");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-LOCATION-UPDATE-DEMAND");
 #.END
 
 
 #.FN_BODY D-LOCATION-UPDATE-ACCEPT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-LOCATION-UPDATE-ACCEPT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-LOCATION-UPDATE-ACCEPT");
 #.END
 
 
 #.FN_BODY D-CONNECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT");
 #.END
 
 #.FN_BODY D-RELEASE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
 #.END
 
 #.FN_BODY D-CONNECT-ACK
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT-ACK");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT-ACK");
 #.END
 
 #.FN_BODY D-INFO
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-INFO");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-INFO");
 #.END
 
 #.FN_BODY D-DISCONNECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-DISCONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-DISCONNECT");
 #.END
 
 #.FN_BODY D-ALERT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-ALERT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-ALERT");
 #.END
 
 #.FN_BODY D-TX-CEASED
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CEASED");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CEASED");
 #.END
 
 
 #.FN_BODY D-STATUS
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-STATUS");
 #.END
 
 #.FN_BODY D-TX-CONTINUE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CONTINUE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CONTINUE");
 #.END
 
 #.FN_BODY D-TX-GRANTED
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-GRANTED");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-GRANTED");
+
 #.END
 
 #.FN_BODY D-TX-WAIT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
 #.END
 
 #.FN_BODY D-CALL-RESTORE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-RESTORE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-RESTORE");
 #.END
 
 #.FN_BODY D-SDS-DATA
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SDS-DATA");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SDS-DATA");
 #.END
 
 #.FN_BODY D-TX-WAIT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
 #.END
 
 
 #.FN_BODY U-ALERT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ALERT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ALERT");
 #.END
 
 #.FN_BODY U-CONNECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CONNECT");
 #.END
 
 #.FN_BODY U-DISCONNECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-DISCONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-DISCONNECT");
 #.END
 
 #.FN_BODY U-RELEASE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
 #.END
 
 #.FN_BODY U-SETUP
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SETUP");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SETUP");
 #.END
 
 #.FN_BODY U-STATUS
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-STATUS");
 #.END
 
 #.FN_BODY U-SDS-DATA
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SDS-DATA");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SDS-DATA");
 #.END
 
 #.FN_BODY U-CALL-RESTORE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CALL-RESTORE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CALL-RESTORE");
 #.END
 
 #.FN_BODY U-TX-DEMAND
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-DEMAND");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-DEMAND");
 #.END
 
 #.FN_BODY U-TX-CEASED
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-CEASED");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-CEASED");
 #.END
 
 
 #.FN_BODY U-MM-STATUS
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
 #.END
 
 #.FN_BODY D-MM-STATUS
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
 #.END
 
 #.FN_BODY U-ATTACH-DETACH-GROUP-IDENTITY
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
 #.END
 
 #.FN_BODY U-ATTACH-DETACH-GROUP-IDENTITY-ACK
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
 		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY-ACK");
-	}
 #.END
 
 #.FN_BODY D-LOCATION-UPDATE-REJECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
 		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-LOCATION-UPDATE-REJECT");
-	}
 #.END
 
 #.FN_BODY D-ATTACH-DETACH-GROUP-IDENTITY
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
 #.END
 
 #.FN_BODY D-ATTACH-DETACH-GROUP-IDENTITY-ACK
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY-ACK");
-	}
-#.END
\ No newline at end of file
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY-ACK");
+#.END
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index 22a2fa791a..f0bc5f92e6 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -254,7 +254,7 @@ de_bmaple_apdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32
 	 */
 
 	apdu_protocol_id = tvb_get_guint8(tvb,curr_offset+1);
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_apdu_protocol_id, tvb, curr_offset+1, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_apdu_protocol_id, tvb, curr_offset+1, 1, ENC_BIG_ENDIAN);
 
 	switch(apdu_protocol_id){
 	case 1:
@@ -312,21 +312,21 @@ de_bmaple_decihp_keys(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g
 
 	/* Spare bits */
 	bit_offset = (offset<<3);
-	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_spare, tvb, bit_offset, 7, FALSE);
+	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_spare, tvb, bit_offset, 7, ENC_BIG_ENDIAN);
 	bit_offset += 7;
 
 	/* Extract the Ciphering Key Flag and add to protocol tree */
-	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_ciphering_key_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_ciphering_key_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 	offset++;
 
 	/* Extract the Current Deciphering Key Value and add to protocol tree */
-	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_current_deciphering_key_value, tvb, bit_offset, 56, FALSE);
+	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_current_deciphering_key_value, tvb, bit_offset, 56, ENC_NA);
 	bit_offset += 56;
 	offset += 7;
 
 	/* Extract the Next Deciphering Key Value and add to protocol tree */
-	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_next_deciphering_key_value, tvb, bit_offset, 56, FALSE);
+	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_next_deciphering_key_value, tvb, bit_offset, 56, ENC_NA);
 	offset += 7;
 
 	return(len);
@@ -348,32 +348,32 @@ de_bmaple_req_gps_ass_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
 
 	/* Octet 3 H G F E D C B A */
 	/* bit H Acquisition Assistance */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_acq_ass, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_acq_ass, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	/* bit G Reference Time */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_ref_time, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_ref_time, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	/* bit F Reference Location */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_ref_loc, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_ref_loc, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	/* bit E DGPS Corrections */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_dgps_corr, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_dgps_corr, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	/* bit D Navigation Model */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_nav_mod, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_nav_mod, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	/* bit C Ionospheric Model */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_iono_mod, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_iono_mod, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	/* bit B UTC Model */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_utc_mod, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_utc_mod, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	/* bit A Almanac */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_almanac, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_almanac, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	curr_offset++;
 
 	/* Octet 4 P O N M L K J I
 	 * bits L through P are Spare bits
 	 */
 	/* bit K Ephemeris Extension Check */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_ephemeris_ext_chk, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_ephemeris_ext_chk, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	/* bit J Ephemeris Extension */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_ephemeris_ext, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_ephemeris_ext, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	/* bit I Real-Time Integrity */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_real_time_int, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_real_time_int, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	curr_offset++;
 
 	/* Octet 5 to Octet 8+2n Satellite related data */
@@ -432,13 +432,13 @@ de_bmaple_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32
 	curr_offset = offset;
 
 	/* cause value  */
-	proto_tree_add_item(tree, hf_gsm_bssmap_le_lcs_cause_value, tvb, curr_offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gsm_bssmap_le_lcs_cause_value, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 	curr_offset++;
 
 	if (len == 2)
 	{
 		/* Diagnostic value (note) */
-		proto_tree_add_item(tree, hf_gsm_bssmap_le_diagnostic_value, tvb, curr_offset, 1, FALSE);
+		proto_tree_add_item(tree, hf_gsm_bssmap_le_diagnostic_value, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
 		curr_offset++;
 	}
 
@@ -476,11 +476,11 @@ de_bmaple_client(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3
 	curr_offset = offset;
 
 	/* Extract the client category and add to protocol tree */
-	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_client_category, tvb, bitCount, 4, FALSE);
+	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_client_category, tvb, bitCount, 4, ENC_BIG_ENDIAN);
 	bitCount = bitCount + 4;
 
 	/* Extract the client subtype and add to protocol tree */
-	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_client_subtype, tvb, bitCount, 4, FALSE);
+	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_client_subtype, tvb, bitCount, 4, ENC_BIG_ENDIAN);
 	bitCount = bitCount + 4;
 	curr_offset++;
 
@@ -501,48 +501,48 @@ de_bmaple_lcs_qos(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint
 
 	bitCount = offset << 3;
 
-	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_spare, tvb, bitCount, 6, FALSE);
+	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_spare, tvb, bitCount, 6, ENC_BIG_ENDIAN);
 	bitCount = bitCount + 6;
 
 	/* Extract Velocity requested element */
-	proto_tree_add_bits_ret_val(tree, hf_gsm_bssmap_le_velocity_requested, tvb, bitCount, 1, &velocityRequested, FALSE);
+	proto_tree_add_bits_ret_val(tree, hf_gsm_bssmap_le_velocity_requested, tvb, bitCount, 1, &velocityRequested, ENC_BIG_ENDIAN);
 	bitCount++;
 
 	/* Extract vertical coordinator element */
-	proto_tree_add_bits_ret_val(tree, hf_gsm_bssmap_le_vertical_coordinate_indicator, tvb, bitCount, 1, &verticalCoordIndicator, FALSE);
+	proto_tree_add_bits_ret_val(tree, hf_gsm_bssmap_le_vertical_coordinate_indicator, tvb, bitCount, 1, &verticalCoordIndicator, ENC_BIG_ENDIAN);
 	bitCount++;
 
 	/* Extract horizontal accuracy element */
-	proto_tree_add_bits_ret_val(tree, hf_gsm_bssmap_le_horizontal_accuracy_indicator, tvb, bitCount, 1, &horizontalAccuracyIndicator, FALSE);
+	proto_tree_add_bits_ret_val(tree, hf_gsm_bssmap_le_horizontal_accuracy_indicator, tvb, bitCount, 1, &horizontalAccuracyIndicator, ENC_BIG_ENDIAN);
 	bitCount++;
 
 	if(horizontalAccuracyIndicator == 1)
 	{
-		proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_horizontal_accuracy, tvb, bitCount, 7, FALSE);
+		proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_horizontal_accuracy, tvb, bitCount, 7, ENC_BIG_ENDIAN);
 		bitCount = bitCount + 7;
 	}
 	else
 	{
-		proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_spare, tvb, bitCount, 7, FALSE);
+		proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_spare, tvb, bitCount, 7, ENC_BIG_ENDIAN);
 		bitCount = bitCount + 7;
 	}
 
 	/* Extract vertical accuracy element */
-	proto_tree_add_bits_ret_val(tree, hf_gsm_bssmap_le_vertical_accuracy_indicator, tvb, bitCount, 1, &verticalAccuracyIndicator, FALSE);
+	proto_tree_add_bits_ret_val(tree, hf_gsm_bssmap_le_vertical_accuracy_indicator, tvb, bitCount, 1, &verticalAccuracyIndicator, ENC_BIG_ENDIAN);
 	bitCount++;
 
 	if(verticalAccuracyIndicator == 1)
 	{
-		proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_vertical_accuracy, tvb, bitCount, 7, FALSE);
+		proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_vertical_accuracy, tvb, bitCount, 7, ENC_BIG_ENDIAN);
 		bitCount = bitCount + 7;
 	}
 	else
 	{
-		proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_spare, tvb, bitCount, 7, FALSE);
+		proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_spare, tvb, bitCount, 7, ENC_BIG_ENDIAN);
 		bitCount = bitCount + 7;
 	}
 
-	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_response_time_category, tvb, bitCount, 2, FALSE);
+	proto_tree_add_bits_item(tree, hf_gsm_bssmap_le_response_time_category, tvb, bitCount, 2, ENC_BIG_ENDIAN);
 	bitCount = bitCount + 2;
 
 	return(len);
@@ -975,10 +975,7 @@ dissect_bssmap_le(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 		bssmap_le_tree = proto_item_add_subtree(bssmap_le_item, ett_gsm_bssmap_le_msg[idx]);
 
-		if (check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", str);
-		}
+		col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", str);
 
 		/*
 		 * add BSSMAP message name
@@ -1047,12 +1044,12 @@ proto_register_gsm_bssmap_le(void)
 		},
 		{ &hf_gsm_bssmap_le_current_deciphering_key_value,
 		  { "Current Deciphering Key Value", "gsm_bssmap_le.decipheringKeys.current",
-		    FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
+		    FT_UINT64, BASE_HEX, NULL, 0x0, NULL,
 		    HFILL}
 		},
 		{ &hf_gsm_bssmap_le_next_deciphering_key_value,
 		  { "Next Deciphering Key Value", "gsm_bssmap_le.decipheringKeys.next",
-		    FT_UINT8, BASE_DEC, NULL, 0x0,
+		    FT_UINT64, BASE_HEX, NULL, 0x0,
 		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_acq_ass,
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c
index 706edb98e3..a1d06c42bc 100644
--- a/epan/dissectors/packet-gsm_rlcmac.c
+++ b/epan/dissectors/packet-gsm_rlcmac.c
@@ -5910,11 +5910,8 @@ dissect_gsm_rlcmac_uplink(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
   rlcmac_tree = proto_item_add_subtree(ti, ett_gsm_rlcmac);
 
   
-  if (check_col(pinfo->cinfo, COL_INFO))
-  {
-  	 col_add_str(pinfo->cinfo, COL_INFO, "(RLC/MAC) ");
-    col_append_str(pinfo->cinfo, COL_INFO,  MT_UL_TextGet(data->u.MESSAGE_TYPE));
-  }
+  col_add_str(pinfo->cinfo, COL_INFO, "(RLC/MAC) ");
+  col_append_str(pinfo->cinfo, COL_INFO,  MT_UL_TextGet(data->u.MESSAGE_TYPE));
 
   switch (data->u.MESSAGE_TYPE)
   {
@@ -6048,36 +6045,33 @@ dissect_gsm_rlcmac_downlink(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
     ti = proto_tree_add_text(tree, tvb, 0, 1, "%s (downlink)", MT_DL_TextGet(data->u.MESSAGE_TYPE));
     rlcmac_tree = proto_item_add_subtree(ti, ett_gsm_rlcmac);
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-    {
-    	col_add_str(pinfo->cinfo, COL_INFO, "(RLC/MAC) ");
-      col_append_str(pinfo->cinfo, COL_INFO,  MT_DL_TextGet(data->u.MESSAGE_TYPE));
-    }
+    col_add_str(pinfo->cinfo, COL_INFO, "(RLC/MAC) ");
+    col_append_str(pinfo->cinfo, COL_INFO,  MT_DL_TextGet(data->u.MESSAGE_TYPE));
     
     /* Dissect the MAC header */
-    proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_payload_type, tvb, 0, 2, FALSE);
-    proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_rrbp, tvb, 2, 2, FALSE);
-    proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_s_p, tvb, 4, 1, FALSE);
-    proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_usf, tvb, 5, 3, FALSE);
+    proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_payload_type, tvb, 0, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_rrbp, tvb, 2, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_s_p, tvb, 4, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_usf, tvb, 5, 3, ENC_BIG_ENDIAN);
 
     if (payload_type == PAYLOAD_TYPE_CTRL_OPT_OCTET)
     {
-      proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_rbsn, tvb, 8, 1, FALSE);
-      proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_rti, tvb, 9, 5, FALSE);
-      proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_fs, tvb, 14, 1, FALSE);
-      proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_ac, tvb, 15, 1, FALSE);
+      proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_rbsn, tvb, 8, 1, ENC_BIG_ENDIAN);
+      proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_rti, tvb, 9, 5, ENC_BIG_ENDIAN);
+      proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_fs, tvb, 14, 1, ENC_BIG_ENDIAN);
+      proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_ac, tvb, 15, 1, ENC_BIG_ENDIAN);
 
       if (ac == 1) /* Indicates presence of TFI optional octet*/
       {
-        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_pr, tvb, 16, 2, FALSE);
-        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_tfi, tvb, 18, 5, FALSE);
-        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_d, tvb, 23, 1, FALSE);
+        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_pr, tvb, 16, 2, ENC_BIG_ENDIAN);
+        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_tfi, tvb, 18, 5, ENC_BIG_ENDIAN);
+        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_d, tvb, 23, 1, ENC_BIG_ENDIAN);
       }
       if ((rbsn == 1) && (fs == 0)) /* Indicates the presence of optional octet 2/3 */
       {
-        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_rbsn_e, tvb, 16, 2, FALSE);
-        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_tfi, tvb, 18, 5, FALSE);
-        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_d, tvb, 23, 1, FALSE);
+        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_rbsn_e, tvb, 16, 2, ENC_BIG_ENDIAN);
+        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_tfi, tvb, 18, 5, ENC_BIG_ENDIAN);
+        proto_tree_add_bits_item(rlcmac_tree, hf_dl_ctrl_d, tvb, 23, 1, ENC_BIG_ENDIAN);
       }
     }
   }
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c
index c780fb8fa3..58f6ba2a42 100644
--- a/epan/dissectors/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
@@ -187,19 +187,19 @@ dissect_h263_group_of_blocks_layer( tvbuff_t *tvb, proto_tree *tree, gint offset
 
 	if(is_rfc4626){
 		/* GBSC 1xxx xxxx */
-		proto_tree_add_bits_item(tree, hf_h263_gbsc, tvb, offset_in_bits, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h263_gbsc, tvb, offset_in_bits, 1, ENC_BIG_ENDIAN);
 		offset_in_bits++;
 	}else{
 		/* Group of Block Start Code (GBSC) (17 bits) 
 		 * A word of 17 bits. Its value is 0000 0000 0000 0000 1.
 		 */
-		proto_tree_add_bits_item(tree, hf_h263_gbsc, tvb, offset_in_bits, 17, FALSE);
+		proto_tree_add_bits_item(tree, hf_h263_gbsc, tvb, offset_in_bits, 17, ENC_BIG_ENDIAN);
 		offset_in_bits = offset_in_bits +17;
 	}
 	/* 
 	 * Group Number (GN) (5 bits)
 	 */
-	proto_tree_add_bits_item(tree, hf_h263_GN, tvb, offset_in_bits, 5, FALSE);
+	proto_tree_add_bits_item(tree, hf_h263_GN, tvb, offset_in_bits, 5, ENC_BIG_ENDIAN);
 	offset_in_bits = offset_in_bits +5;
 	/* 5.2.4 GOB Sub-Bitstream Indicator (GSBI) (2 bits)
 	 * A fixed length codeword of 2 bits that is only present if CPM is "1" in the picture header.
@@ -239,18 +239,18 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 	if(is_rfc4626){
 		/* PC 1000 00xx */ 
-		proto_tree_add_bits_item(tree, hf_h263_psc, tvb, offset_in_bits, 6, FALSE);
+		proto_tree_add_bits_item(tree, hf_h263_psc, tvb, offset_in_bits, 6, ENC_BIG_ENDIAN);
 		offset_in_bits = offset_in_bits +6;
 
 	}else{
 	/* Check for PSC, PSC is a word of 22 bits. 
 	 * Its value is 0000 0000 0000 0000' 1000 00xx xxxx xxxx.
 	 */
-		proto_tree_add_bits_item(tree, hf_h263_psc, tvb, offset_in_bits, 22, FALSE);
+		proto_tree_add_bits_item(tree, hf_h263_psc, tvb, offset_in_bits, 22, ENC_BIG_ENDIAN);
 		offset_in_bits = offset_in_bits +22;
 
 	}
-	proto_tree_add_bits_item(tree, hf_h263_TR, tvb, offset_in_bits, 8, FALSE);
+	proto_tree_add_bits_item(tree, hf_h263_TR, tvb, offset_in_bits, 8, ENC_BIG_ENDIAN);
 	offset_in_bits = offset_in_bits +8;
 	/*
 	 * Bit 1: Always "1", in order to avoid start code emulation. 
@@ -258,63 +258,62 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	 */
 	offset_in_bits = offset_in_bits +2;
 	/* Bit 3: Split screen indicator, "0" off, "1" on. */
-	proto_tree_add_bits_item( tree, hf_h263_split_screen_indicator, tvb, offset_in_bits, 1, FALSE);
+	proto_tree_add_bits_item( tree, hf_h263_split_screen_indicator, tvb, offset_in_bits, 1, ENC_BIG_ENDIAN);
 	offset_in_bits++;
 	/* Bit 4: Document camera indicator, */
-	proto_tree_add_bits_item( tree, hf_h263_document_camera_indicator, tvb, offset_in_bits, 1, FALSE);
+	proto_tree_add_bits_item( tree, hf_h263_document_camera_indicator, tvb, offset_in_bits, 1, ENC_BIG_ENDIAN);
 	offset_in_bits++;
 	/* Bit 5: Full Picture Freeze Release, "0" off, "1" on. */
-	proto_tree_add_bits_item( tree, hf_h263_full_picture_freeze_release, tvb, offset_in_bits, 1, FALSE);
+	proto_tree_add_bits_item( tree, hf_h263_full_picture_freeze_release, tvb, offset_in_bits, 1, ENC_BIG_ENDIAN);
 	offset_in_bits++;
 	/* Bits 6-8: Source Format, "000" forbidden, "001" sub-QCIF, "010" QCIF, "011" CIF,
 	 * "100" 4CIF, "101" 16CIF, "110" reserved, "111" extended PTYPE.
 	 */
-	proto_tree_add_bits_ret_val( tree, hf_h263_source_format, tvb, offset_in_bits, 3 ,&source_format, FALSE);
+	proto_tree_add_bits_ret_val( tree, hf_h263_source_format, tvb, offset_in_bits, 3 ,&source_format, ENC_BIG_ENDIAN);
 	offset_in_bits = offset_in_bits +3;
 	if (source_format != H263_PLUSPTYPE){
 		/* Not extended PTYPE */
 		/* Bit 9: Picture Coding Type, "0" INTRA (I-picture), "1" INTER (P-picture). */
-		proto_tree_add_bits_ret_val( tree, hf_h263_payload_picture_coding_type, tvb, offset_in_bits, 1, &picture_coding_type, FALSE);
-		if ( check_col( pinfo->cinfo, COL_INFO) )
-			col_append_str(pinfo->cinfo, COL_INFO, val_to_str((guint32)picture_coding_type, picture_coding_type_vals, "Unknown (%u)"));
+		proto_tree_add_bits_ret_val( tree, hf_h263_payload_picture_coding_type, tvb, offset_in_bits, 1, &picture_coding_type, ENC_BIG_ENDIAN);
+		col_append_str(pinfo->cinfo, COL_INFO, val_to_str((guint32)picture_coding_type, picture_coding_type_vals, "Unknown (%u)"));
 		offset_in_bits++;
 		/* Bit 10: Optional Unrestricted Motion Vector mode (see Annex D), "0" off, "1" on. */
-		proto_tree_add_bits_item( tree, hf_h263_opt_unres_motion_vector_mode, tvb, offset_in_bits, 1, FALSE);
+		proto_tree_add_bits_item( tree, hf_h263_opt_unres_motion_vector_mode, tvb, offset_in_bits, 1, ENC_BIG_ENDIAN);
 		offset_in_bits++;
 		/* Bit 11: Optional Syntax-based Arithmetic Coding mode (see Annex E), "0" off, "1" on.*/
-		proto_tree_add_bits_item( tree, hf_h263_syntax_based_arithmetic_coding_mode, tvb, offset_in_bits, 1, FALSE);
+		proto_tree_add_bits_item( tree, hf_h263_syntax_based_arithmetic_coding_mode, tvb, offset_in_bits, 1, ENC_BIG_ENDIAN);
 		offset_in_bits++;
 		/* Bit 12: Optional Advanced Prediction mode (see Annex F), "0" off, "1" on.*/
-		proto_tree_add_bits_item( tree, hf_h263_optional_advanced_prediction_mode, tvb, offset_in_bits, 1, FALSE);
+		proto_tree_add_bits_item( tree, hf_h263_optional_advanced_prediction_mode, tvb, offset_in_bits, 1, ENC_BIG_ENDIAN);
 		offset_in_bits++;
 		/* Bit 13: Optional PB-frames mode (see Annex G), "0" normal I- or P-picture, "1" PB-frame.*/
-		proto_tree_add_bits_ret_val( tree, hf_h263_PB_frames_mode, tvb, offset_in_bits, 1, &PB_frames_mode, FALSE);
+		proto_tree_add_bits_ret_val( tree, hf_h263_PB_frames_mode, tvb, offset_in_bits, 1, &PB_frames_mode, ENC_BIG_ENDIAN);
 		offset_in_bits++;
 	}else{
 		/* Extended PTYPE 
 		 * Update Full Extended PTYPE (UFEP) (3 bits)
 		 */
 		/* .... ..xx x... .... */
-		proto_tree_add_bits_ret_val( tree, hf_h263_UFEP, tvb, offset_in_bits, 3, &ufep, FALSE);
+		proto_tree_add_bits_ret_val( tree, hf_h263_UFEP, tvb, offset_in_bits, 3, &ufep, ENC_BIG_ENDIAN);
 		offset_in_bits = offset_in_bits +3;
 		if(ufep==1){
 			/* The Optional Part of PLUSPTYPE (OPPTYPE) (18 bits) 
 			 */
 			 /*  .xxx xxxx  xxxx xxxx  xxx. .... */
-			opptype_item = proto_tree_add_bits_item( tree, hf_h263_opptype, tvb, offset_in_bits, 18, FALSE);
+			opptype_item = proto_tree_add_bits_item( tree, hf_h263_opptype, tvb, offset_in_bits, 18, ENC_BIG_ENDIAN);
 			h263_opptype_tree = proto_item_add_subtree( opptype_item, ett_h263_optype );
 			/*
 			 * If UFEP is "001", then the following bits are present in PLUSPTYPE:
 			 *  Bits 1-3 Source Format, "000" reserved, "001" sub-QCIF, "010" QCIF, "011" CIF,
 			 * "100" 4CIF, "101" 16CIF, "110" custom source format, "111" reserved;
 			 */
-			proto_tree_add_bits_item( h263_opptype_tree, hf_h263_ext_source_format, tvb, offset_in_bits, 3, FALSE);
+			proto_tree_add_bits_item( h263_opptype_tree, hf_h263_ext_source_format, tvb, offset_in_bits, 3, ENC_BIG_ENDIAN);
 			offset_in_bits+=3;
 			
 			/*
 			 *  Bit 4 Optional Custom PCF, "0" CIF PCF, "1" custom PCF;
 			 */
-			proto_tree_add_bits_ret_val( h263_opptype_tree, hf_h263_custom_pcf, tvb, offset_in_bits, 1, &custom_pcf, FALSE);
+			proto_tree_add_bits_ret_val( h263_opptype_tree, hf_h263_custom_pcf, tvb, offset_in_bits, 1, &custom_pcf, ENC_BIG_ENDIAN);
 			offset_in_bits++;
 			saved_bit_offset=offset_in_bits;
 			/*
@@ -373,7 +372,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 			 *  Bit 18 Reserved, shall be equal to "0".
 			 */
 			offset_in_bits++;
-			proto_tree_add_bits_item( h263_opptype_tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, FALSE);
+			proto_tree_add_bits_item( h263_opptype_tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, ENC_NA);
 			
 		}
 		/*
@@ -389,7 +388,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 		 * "110" Reserved;
 		 * "111" Reserved;
 		 */
-		proto_tree_add_bits_ret_val( tree, hf_h263_picture_type_code, tvb, offset_in_bits, 3, &picture_type_code, FALSE);
+		proto_tree_add_bits_ret_val( tree, hf_h263_picture_type_code, tvb, offset_in_bits, 3, &picture_type_code, ENC_BIG_ENDIAN);
 		offset_in_bits+=3;
 		saved_bit_offset=offset_in_bits;
 		/*
@@ -416,20 +415,20 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 		 *  Bit 9 Equal to "1" to prevent start code emulation.
 		 */
 		offset_in_bits++;
-		proto_tree_add_bits_item( tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, FALSE);
+		proto_tree_add_bits_item( tree, hf_h263_not_dissected, tvb, saved_bit_offset, offset_in_bits-saved_bit_offset, ENC_NA);
 		/* The picture header location of CPM (1 bit) and PSBI (2 bits)
 		 * the picture header depends on whether or not PLUSPTYPE is present 
 		 * (see 5.1.20 and 5.1.21). If PLUSPTYPE is present, then CPM follows
 		 * immediately after PLUSPTYPE in the picture header.
 		 */
-		proto_tree_add_bits_ret_val( tree, hf_h263_cpm, tvb, offset_in_bits, 1, &cpm, FALSE);
+		proto_tree_add_bits_ret_val( tree, hf_h263_cpm, tvb, offset_in_bits, 1, &cpm, ENC_BIG_ENDIAN);
 		offset_in_bits++;
 		/* 5.1.21 Picture Sub-Bitstream Indicator (PSBI) (2 bits)
 		 * only present if Continuous Presence Multipoint and Video
 		 * Multiplex mode is indicated by CPM.
 		 */
 		if(cpm==1){
-			proto_tree_add_bits_item( tree, hf_h263_psbi, tvb, offset_in_bits, 2, FALSE);
+			proto_tree_add_bits_item( tree, hf_h263_psbi, tvb, offset_in_bits, 2, ENC_BIG_ENDIAN);
 			offset_in_bits+=2;
 		}
 		return offset_in_bits>>3;
@@ -546,17 +545,17 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 		 */
 	}
 	/* 5.1.19 Quantizer Information (PQUANT) (5 bits) */
-	proto_tree_add_bits_item( tree, hf_h263_pquant, tvb, offset_in_bits, 5, FALSE);
+	proto_tree_add_bits_item( tree, hf_h263_pquant, tvb, offset_in_bits, 5, ENC_BIG_ENDIAN);
 	offset_in_bits = offset_in_bits +5;
 	if (source_format != H263_PLUSPTYPE){
-		proto_tree_add_bits_ret_val( tree, hf_h263_cpm, tvb, offset_in_bits, 1, &cpm, FALSE);
+		proto_tree_add_bits_ret_val( tree, hf_h263_cpm, tvb, offset_in_bits, 1, &cpm, ENC_BIG_ENDIAN);
 		offset_in_bits++;
 		/* 5.1.21 Picture Sub-Bitstream Indicator (PSBI) (2 bits)
 		 * only present if Continuous Presence Multipoint and Video
 		 * Multiplex mode is indicated by CPM.
 		 */
 		if(cpm==1){
-			proto_tree_add_bits_item( tree, hf_h263_psbi, tvb, offset_in_bits, 2, FALSE);
+			proto_tree_add_bits_item( tree, hf_h263_psbi, tvb, offset_in_bits, 2, ENC_BIG_ENDIAN);
 			offset_in_bits = offset_in_bits +2;
 		}
 	}
@@ -567,10 +566,10 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	 */
 	if((PB_frames_mode == 1)||(picture_type_code == 2 )){
 		if(custom_pcf == 0){
-			proto_tree_add_bits_item( tree, hf_h263_trb, tvb, offset_in_bits, 3, FALSE);
+			proto_tree_add_bits_item( tree, hf_h263_trb, tvb, offset_in_bits, 3, ENC_BIG_ENDIAN);
 			offset_in_bits = offset_in_bits +3;
 		}else{
-			proto_tree_add_bits_item( tree, hf_h263_trb, tvb, offset_in_bits, 5, FALSE);
+			proto_tree_add_bits_item( tree, hf_h263_trb, tvb, offset_in_bits, 5, ENC_BIG_ENDIAN);
 			offset_in_bits = offset_in_bits +5;
 		}
 	}
@@ -583,7 +582,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	/* 5.1.24 Extra Insertion Information (PEI) (1 bit)
 	 * A bit which when set to "1" signals the presence of the following optional data field.
 	 */
-	proto_tree_add_bits_ret_val( tree, hf_h263_pei, tvb, offset_in_bits, 1, &pei, FALSE);
+	proto_tree_add_bits_ret_val( tree, hf_h263_pei, tvb, offset_in_bits, 1, &pei, ENC_BIG_ENDIAN);
 	offset_in_bits++;
 	while(pei==1)
 	{
@@ -591,9 +590,9 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 		 * If PEI is set to "1", then 9 bits follow consisting of 8 bits of data (PSUPP) and then another PEI bit
 		 * to indicate if a further 9 bits follow and so on. Encoders shall use PSUPP as specified in Annex L.
 		 */
-		proto_tree_add_bits_item( tree, hf_h263_psupp, tvb, offset_in_bits, 8, FALSE);
+		proto_tree_add_bits_item( tree, hf_h263_psupp, tvb, offset_in_bits, 8, ENC_BIG_ENDIAN);
 		offset_in_bits+=8;
-		proto_tree_add_bits_ret_val( tree, hf_h263_pei, tvb, offset_in_bits, 1, &pei, FALSE);
+		proto_tree_add_bits_ret_val( tree, hf_h263_pei, tvb, offset_in_bits, 1, &pei, ENC_BIG_ENDIAN);
 		offset_in_bits++;
 	}
 	/* For the first GOB in each picture (with number 0), no GOB header shall be transmitted.
@@ -668,7 +667,7 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
 				 * ( 1000 00x.)
 				 */
 				col_append_str( pinfo->cinfo, COL_INFO, "(PSC) ");
-				offset = dissect_h263_picture_layer( tvb, pinfo, h263_payload_tree, offset, -1, FALSE);
+				offset = dissect_h263_picture_layer( tvb, pinfo, h263_payload_tree, offset, -1, ENC_NA);
 				break;
 			case 0xfc:
 			case 0xfe:
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index e6eb7425f9..23f662356f 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -689,12 +689,12 @@ dissect_h264_rbsp_trailing_bits(proto_tree *tree, tvbuff_t *tvb, packet_info *pi
 {
 	gint remaining_bits=0;
 
-	proto_tree_add_bits_item(tree, hf_h264_rbsp_stop_bit, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_rbsp_stop_bit, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if((bit_offset&0x7)!=0){
 		remaining_bits = 8 - (bit_offset&0x7);
-		proto_tree_add_bits_item(tree, hf_h264_rbsp_trailing_bits, tvb, bit_offset, remaining_bits, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_rbsp_trailing_bits, tvb, bit_offset, remaining_bits, ENC_BIG_ENDIAN);
 	}
 
 	return bit_offset+remaining_bits;
@@ -721,7 +721,7 @@ dissect_h264_slice_header(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U
 	/*
 	 * represented by log2_max_frame_num_minus4 + 4 bits in
 	 * the bitstream
-	 * proto_tree_add_bits_item(tree, hf_h264_frame_num, tvb, bit_offset, 4, FALSE);
+	 * proto_tree_add_bits_item(tree, hf_h264_frame_num, tvb, bit_offset, 4, ENC_BIG_ENDIAN);
 	 */
 
 
@@ -767,11 +767,11 @@ dissect_h264_hrd_parameters(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo
 	cpb_cnt_minus1 = dissect_h264_exp_golomb_code(tree, hf_h264_cpb_cnt_minus1, tvb, &bit_offset, H264_UE_V);
 
 	/* bit_rate_scale 0 u(4) */
-	proto_tree_add_bits_item(tree, hf_h264_bit_rate_scale, tvb, bit_offset, 4, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_bit_rate_scale, tvb, bit_offset, 4, ENC_BIG_ENDIAN);
 	bit_offset = bit_offset + 4;
 
 	/* cpb_size_scale 0 u(4) */
-	proto_tree_add_bits_item(tree, hf_h264_cpb_size_scale, tvb, bit_offset, 4, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_cpb_size_scale, tvb, bit_offset, 4, ENC_BIG_ENDIAN);
 	bit_offset = bit_offset + 4;
 	/* for( SchedSelIdx = 0; SchedSelIdx <= cpb_cnt_minus1; SchedSelIdx++ ) { */
 	for( SchedSelIdx = 0; SchedSelIdx <= cpb_cnt_minus1; SchedSelIdx++ ) {
@@ -783,23 +783,23 @@ dissect_h264_hrd_parameters(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo
 		dissect_h264_exp_golomb_code(tree, hf_h264_cpb_size_value_minus1, tvb, &bit_offset, H264_UE_V);
 
 		/* cbr_flag[ SchedSelIdx ] 0 u(1) */
-		proto_tree_add_bits_item(tree, hf_h264_cbr_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_cbr_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 	}
 	/* initial_cpb_removal_delay_length_minus1 0 u(5) */
-	proto_tree_add_bits_item(tree, hf_h264_initial_cpb_removal_delay_length_minus1, tvb, bit_offset, 5, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_initial_cpb_removal_delay_length_minus1, tvb, bit_offset, 5, ENC_BIG_ENDIAN);
 	bit_offset = bit_offset + 5;
 
 	/* cpb_removal_delay_length_minus1 0 u(5) */
-	proto_tree_add_bits_item(tree, hf_h264_cpb_removal_delay_length_minus1, tvb, bit_offset, 5, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_cpb_removal_delay_length_minus1, tvb, bit_offset, 5, ENC_BIG_ENDIAN);
 	bit_offset = bit_offset + 5;
 
 	/* dpb_output_delay_length_minus1 0 u(5) */
-	proto_tree_add_bits_item(tree, hf_h264_dpb_output_delay_length_minus11, tvb, bit_offset, 5, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_dpb_output_delay_length_minus11, tvb, bit_offset, 5, ENC_BIG_ENDIAN);
 	bit_offset = bit_offset + 5;
 
 	/* time_offset_length 0 u(5) */
-	proto_tree_add_bits_item(tree, hf_h264_time_offset_length, tvb, bit_offset, 5, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_time_offset_length, tvb, bit_offset, 5, ENC_BIG_ENDIAN);
 	bit_offset = bit_offset + 5;
 
 	return bit_offset;
@@ -835,73 +835,73 @@ dissect_h264_vui_parameters(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
 	 * aspect_ratio_info_present_flag 0 u(1)
 	 */
 	aspect_ratio_info_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_aspect_ratio_info_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_aspect_ratio_info_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if( aspect_ratio_info_present_flag ) {
 		/* aspect_ratio_idc 0 u(8) */
 		aspect_ratio_idc = tvb_get_bits8(tvb, bit_offset, 8);
-		proto_tree_add_bits_item(tree, hf_h264_aspect_ratio_idc, tvb, bit_offset, 8, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_aspect_ratio_idc, tvb, bit_offset, 8, ENC_BIG_ENDIAN);
 		bit_offset = bit_offset + 8;
 
 		if( aspect_ratio_idc == EXTENDED_SAR ) {
 			/* sar_width 0 u(16) */
-			proto_tree_add_bits_item(tree, hf_h264_sar_width, tvb, bit_offset, 16, FALSE);
+			proto_tree_add_bits_item(tree, hf_h264_sar_width, tvb, bit_offset, 16, ENC_BIG_ENDIAN);
 			bit_offset = bit_offset + 16;
 
 			/* sar_height 0 u(16) */
-			proto_tree_add_bits_item(tree, hf_h264_sar_height, tvb, bit_offset, 16, FALSE);
+			proto_tree_add_bits_item(tree, hf_h264_sar_height, tvb, bit_offset, 16, ENC_BIG_ENDIAN);
 			bit_offset = bit_offset + 16;
 		}
 	}
 	/* overscan_info_present_flag 0 u(1) */
 	overscan_info_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_overscan_info_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_overscan_info_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if( overscan_info_present_flag ){
 		/* overscan_appropriate_flag 0 u(1) */
-		proto_tree_add_bits_item(tree, hf_h264_overscan_appropriate_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_overscan_appropriate_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 	}
 
 	/* video_signal_type_present_flag 0 u(1) */
 	video_signal_type_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_video_signal_type_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_video_signal_type_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if( video_signal_type_present_flag ) {
 		/* video_format 0 u(3) > */
-		proto_tree_add_bits_item(tree, hf_h264_video_format, tvb, bit_offset, 3, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_video_format, tvb, bit_offset, 3, ENC_BIG_ENDIAN);
 		bit_offset = bit_offset + 3;
 
 		/* video_full_range_flag 0 u(1)*/
-		proto_tree_add_bits_item(tree, hf_h264_video_full_range_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_video_full_range_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 
 		/* colour_description_present_flag 0 u(1) */
 		colour_description_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-		proto_tree_add_bits_item(tree, hf_h264_colour_description_present_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_colour_description_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 
 		if( colour_description_present_flag ) {
 			/* colour_primaries 0 u(8) */
-			proto_tree_add_bits_item(tree, hf_h264_colour_primaries, tvb, bit_offset, 8, FALSE);
+			proto_tree_add_bits_item(tree, hf_h264_colour_primaries, tvb, bit_offset, 8, ENC_BIG_ENDIAN);
 			bit_offset = bit_offset + 8;
 
 			/* transfer_characteristics 0 u(8) */
-			proto_tree_add_bits_item(tree, hf_h264_transfer_characteristics, tvb, bit_offset, 8, FALSE);
+			proto_tree_add_bits_item(tree, hf_h264_transfer_characteristics, tvb, bit_offset, 8, ENC_BIG_ENDIAN);
 			bit_offset = bit_offset + 8;
 
 			/* matrix_coefficients 0 u(8)*/
-			proto_tree_add_bits_item(tree, hf_h264_matrix_coefficients, tvb, bit_offset, 8, FALSE);
+			proto_tree_add_bits_item(tree, hf_h264_matrix_coefficients, tvb, bit_offset, 8, ENC_BIG_ENDIAN);
 			bit_offset = bit_offset + 8;
 		}
 	}
 
 	/* chroma_loc_info_present_flag 0 u(1) */
 	chroma_loc_info_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_chroma_loc_info_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_chroma_loc_info_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if( chroma_loc_info_present_flag ) {
@@ -914,25 +914,25 @@ dissect_h264_vui_parameters(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
 
 	/* timing_info_present_flag 0 u(1) */
 	timing_info_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_timing_info_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_timing_info_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if( timing_info_present_flag ) {
 		/* num_units_in_tick 0 u(32) */
-		proto_tree_add_bits_item(tree, hf_h264_num_units_in_tick, tvb, bit_offset, 32, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_num_units_in_tick, tvb, bit_offset, 32, ENC_BIG_ENDIAN);
 		bit_offset = bit_offset + 32;
 
 		/* time_scale 0 u(32) */
-		proto_tree_add_bits_item(tree, hf_h264_time_scale, tvb, bit_offset, 32, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_time_scale, tvb, bit_offset, 32, ENC_BIG_ENDIAN);
 		bit_offset = bit_offset + 32;
 
 		/* fixed_frame_rate_flag 0 u(1) */
-		proto_tree_add_bits_item(tree, hf_h264_fixed_frame_rate_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_fixed_frame_rate_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 	}
 	/* nal_hrd_parameters_present_flag 0 u(1) */
 	nal_hrd_parameters_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_nal_hrd_parameters_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_nal_hrd_parameters_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if( nal_hrd_parameters_present_flag ){
@@ -942,7 +942,7 @@ dissect_h264_vui_parameters(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
 
 	/* vcl_hrd_parameters_present_flag 0 u(1) */
 	vcl_hrd_parameters_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_vcl_hrd_parameters_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_vcl_hrd_parameters_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if( vcl_hrd_parameters_present_flag ){
@@ -951,21 +951,21 @@ dissect_h264_vui_parameters(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
 	}
 	if( nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag ){
 		/* low_delay_hrd_flag 0 u(1) */
-		proto_tree_add_bits_item(tree, hf_h264_low_delay_hrd_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_low_delay_hrd_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 	}
 	/* pic_struct_present_flag 0 u(1) */
-	proto_tree_add_bits_item(tree, hf_h264_pic_struct_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_pic_struct_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	/* bitstream_restriction_flag 0 u(1) */
 	bitstream_restriction_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_bitstream_restriction_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_bitstream_restriction_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if( bitstream_restriction_flag ) {
 		/* motion_vectors_over_pic_boundaries_flag 0 u(1) */
-		proto_tree_add_bits_item(tree, hf_h264_motion_vectors_over_pic_boundaries_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_motion_vectors_over_pic_boundaries_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 
 		/* max_bytes_per_pic_denom 0 ue(v) */
@@ -1001,18 +1001,18 @@ dissect_h264_profile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 	guint8	constraint_set3_flag;
 	guint32	level_idc;
 
-	item = proto_tree_add_item(tree, hf_h264_profile, tvb, offset, -1, FALSE);
+	item = proto_tree_add_item(tree, hf_h264_profile, tvb, offset, -1, ENC_NA);
 	h264_profile_tree = proto_item_add_subtree(item, ett_h264_profile);
 
-	proto_tree_add_item(h264_profile_tree, hf_h264_profile_idc, tvb, offset, 1, FALSE);
+	proto_tree_add_item(h264_profile_tree, hf_h264_profile_idc, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
 
 	constraint_set3_flag = (tvb_get_guint8(tvb,offset)&0x10)>>4;
-	proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set0_flag, tvb, offset, 1, FALSE);
-	proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set1_flag, tvb, offset, 1, FALSE);
-	proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set2_flag, tvb, offset, 1, FALSE);
-	proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set3_flag, tvb, offset, 1, FALSE);
-	proto_tree_add_item(h264_profile_tree, hf_h264_reserved_zero_4bits, tvb, offset, 1, FALSE);
+	proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set0_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
+	proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set1_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
+	proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set2_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
+	proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set3_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
+	proto_tree_add_item(h264_profile_tree, hf_h264_reserved_zero_4bits, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
 
 	/* A level to which the bitstream conforms shall be indicated by the syntax element level_idc as follows.
@@ -1023,7 +1023,7 @@ dissect_h264_profile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 	 */
 
 	level_idc = tvb_get_guint8(tvb,offset);
-	level_item = proto_tree_add_item(h264_profile_tree, hf_h264_level_idc, tvb, offset, 1, FALSE);
+	level_item = proto_tree_add_item(h264_profile_tree, hf_h264_level_idc, tvb, offset, 1, ENC_BIG_ENDIAN);
 	if((level_idc==11)&&(constraint_set3_flag==1)){
 		proto_item_append_text(level_item," [Level 1b (128kb/s)]");
 	}else{
@@ -1322,29 +1322,29 @@ dissect_h264_seq_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 
 	/* profile_idc 0 u(8) */
 	profile_idc = tvb_get_guint8(tvb,offset);
-	proto_tree_add_item(tree, hf_h264_profile_idc, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_h264_profile_idc, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
 
 	constraint_set3_flag = (tvb_get_guint8(tvb,offset)&0x10)>>4;
 	/* constraint_set0_flag 0 u(1) */
-	proto_tree_add_item(tree, hf_h264_constraint_set0_flag, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_h264_constraint_set0_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 	/* constraint_set1_flag 0 u(1) */
-	proto_tree_add_item(tree, hf_h264_constraint_set1_flag, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_h264_constraint_set1_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 	/* constraint_set2_flag 0 u(1) */
-	proto_tree_add_item(tree, hf_h264_constraint_set2_flag, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_h264_constraint_set2_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 	/* constraint_set3_flag 0 u(1) */
-	proto_tree_add_item(tree, hf_h264_constraint_set3_flag, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_h264_constraint_set3_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 	/* reserved_zero_4bits  equal to 0  0 u(4)*/
-	proto_tree_add_item(tree, hf_h264_reserved_zero_4bits, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_h264_reserved_zero_4bits, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
 
 	/* level_idc 0 u(8) */
 	level_idc = tvb_get_guint8(tvb,offset);
-	level_item = proto_tree_add_item(tree, hf_h264_level_idc, tvb, offset, 1, FALSE);
+	level_item = proto_tree_add_item(tree, hf_h264_level_idc, tvb, offset, 1, ENC_BIG_ENDIAN);
 	if((level_idc==11)&&(constraint_set3_flag==1)){
 		proto_item_append_text(level_item,"[Level 1b]");
 	}else{
@@ -1366,7 +1366,7 @@ dissect_h264_seq_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 		chroma_format_idc = dissect_h264_exp_golomb_code(tree, hf_h264_chroma_format_idc, tvb, &bit_offset, H264_UE_V);
 		if( chroma_format_idc == 3 ){
 			/* residual_colour_transform_flag 0 u(1) */
-			proto_tree_add_bits_item(tree, hf_h264_residual_colour_transform_flag, tvb, bit_offset, 1, FALSE);
+			proto_tree_add_bits_item(tree, hf_h264_residual_colour_transform_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 			bit_offset++;
 		}
 
@@ -1377,12 +1377,12 @@ dissect_h264_seq_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 		dissect_h264_exp_golomb_code(tree, hf_h264_bit_depth_chroma_minus8, tvb, &bit_offset, H264_UE_V);
 
 		/* qpprime_y_zero_transform_bypass_flag 0 u(1) */
-		proto_tree_add_bits_item(tree, hf_h264_qpprime_y_zero_transform_bypass_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_qpprime_y_zero_transform_bypass_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 
 		/* seq_scaling_matrix_present_flag 0 u(1) */
 		seq_scaling_matrix_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-		proto_tree_add_bits_item(tree, hf_h264_seq_scaling_matrix_present_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_seq_scaling_matrix_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 
 		if( seq_scaling_matrix_present_flag ){
@@ -1417,7 +1417,7 @@ dissect_h264_seq_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 		dissect_h264_exp_golomb_code(tree, hf_h264_log2_max_pic_order_cnt_lsb_minus4, tvb, &bit_offset, H264_UE_V);
 	}else if(pic_order_cnt_type == 1) {
 		/* delta_pic_order_always_zero_flag 0 u(1) */
-		proto_tree_add_bits_item(tree, hf_h264_delta_pic_order_always_zero_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_delta_pic_order_always_zero_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 
 		/* offset_for_non_ref_pic 0 se(v) */
@@ -1437,7 +1437,7 @@ dissect_h264_seq_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 	dissect_h264_exp_golomb_code(tree, hf_h264_num_ref_frames, tvb, &bit_offset, H264_UE_V);
 
 	/* 	gaps_in_frame_num_value_allowed_flag 0 u(1) */
-	proto_tree_add_bits_item(tree, hf_h264_gaps_in_frame_num_value_allowed_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_gaps_in_frame_num_value_allowed_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	/* 	pic_width_in_mbs_minus1 0 ue(v) */
@@ -1448,21 +1448,21 @@ dissect_h264_seq_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 
 	/* frame_mbs_only_flag 0 u(1) */
 	frame_mbs_only_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_frame_mbs_only_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_frame_mbs_only_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 	if( !frame_mbs_only_flag ){
 		/* mb_adaptive_frame_field_flag 0 u(1) */
-		proto_tree_add_bits_item(tree, hf_h264_mb_adaptive_frame_field_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_mb_adaptive_frame_field_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 	}
 
 	/* direct_8x8_inference_flag 0 u(1) */
-	proto_tree_add_bits_item(tree, hf_h264_direct_8x8_inference_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_direct_8x8_inference_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	/* frame_cropping_flag 0 u(1) */
 	frame_cropping_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_frame_cropping_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_frame_cropping_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if(frame_cropping_flag) {
@@ -1476,7 +1476,7 @@ dissect_h264_seq_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 
 	/* 	vui_parameters_present_flag 0 u(1) */
 	vui_parameters_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-	proto_tree_add_bits_item(tree, hf_h264_vui_parameters_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_vui_parameters_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 	if(vui_parameters_present_flag){
 		bit_offset = dissect_h264_vui_parameters(tree, tvb, pinfo, bit_offset);
@@ -1508,11 +1508,11 @@ dissect_h264_pic_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 	dissect_h264_exp_golomb_code(tree, hf_h264_seq_parameter_set_id, tvb, &bit_offset, H264_UE_V);
 
 	/* entropy_coding_mode_flag 1 u(1) */
-	proto_tree_add_bits_item(tree, hf_h264_entropy_coding_mode_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_entropy_coding_mode_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	/* pic_order_present_flag 1 u(1)*/
-	proto_tree_add_bits_item(tree, hf_h264_pic_order_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_pic_order_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	/* num_slice_groups_minus1 1 ue(v)*/
@@ -1550,11 +1550,11 @@ dissect_h264_pic_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 	dissect_h264_exp_golomb_code(tree, hf_h264_num_ref_idx_l1_active_minus1, tvb, &bit_offset, H264_UE_V);
 
 	/* weighted_pred_flag 1 u(1)*/
-	proto_tree_add_bits_item(tree, hf_h264_weighted_pred_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_weighted_pred_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	/* weighted_bipred_idc 1 u(2)*/
-	proto_tree_add_bits_item(tree, hf_h264_weighted_bipred_idc, tvb, bit_offset, 2, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_weighted_bipred_idc, tvb, bit_offset, 2, ENC_BIG_ENDIAN);
 	bit_offset= bit_offset+2;
 
 	/* pic_init_qp_minus26  * relative to 26 * 1 se(v)*/
@@ -1567,25 +1567,25 @@ dissect_h264_pic_parameter_set_rbsp(proto_tree *tree, tvbuff_t *tvb, packet_info
 	dissect_h264_exp_golomb_code(tree, hf_h264_chroma_qp_index_offset, tvb, &bit_offset, H264_SE_V);
 
 	/* deblocking_filter_control_present_flag 1 u(1)*/
-	proto_tree_add_bits_item(tree, hf_h264_deblocking_filter_control_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_deblocking_filter_control_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	/* constrained_intra_pred_flag 1 u(1)*/
-	proto_tree_add_bits_item(tree, hf_h264_constrained_intra_pred_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_constrained_intra_pred_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	/* redundant_pic_cnt_present_flag 1 u(1)*/
-	proto_tree_add_bits_item(tree, hf_h264_redundant_pic_cnt_present_flag, tvb, bit_offset, 1, FALSE);
+	proto_tree_add_bits_item(tree, hf_h264_redundant_pic_cnt_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 	bit_offset++;
 
 	if( more_rbsp_data(tree, tvb, pinfo, bit_offset)){
 		/* transform_8x8_mode_flag 1 u(1)*/
-		proto_tree_add_bits_item(tree, hf_h264_transform_8x8_mode_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_transform_8x8_mode_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 
 		/* pic_scaling_matrix_present_flag 1 u(1)*/
 		pic_scaling_matrix_present_flag = tvb_get_bits8(tvb, bit_offset, 1);
-		proto_tree_add_bits_item(tree, hf_h264_pic_scaling_matrix_present_flag, tvb, bit_offset, 1, FALSE);
+		proto_tree_add_bits_item(tree, hf_h264_pic_scaling_matrix_present_flag, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
 		bit_offset++;
 
 		if( pic_scaling_matrix_present_flag ){
@@ -1691,7 +1691,7 @@ dissect_h264_nal_unit(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 	gint	offset = 0;
 	guint8 nal_unit_type;
 	guint32 dword;
-	item = proto_tree_add_item(tree, hf_h264_nal_unit, tvb, offset, -1, FALSE);
+	item = proto_tree_add_item(tree, hf_h264_nal_unit, tvb, offset, -1, ENC_NA);
 	h264_nal_tree = proto_item_add_subtree(item, ett_h264_nal_unit);
 
 startover:
@@ -1710,11 +1710,11 @@ startover:
 	nal_unit_type = tvb_get_guint8(tvb,offset) & 0x1f;
 
 	/* forbidden_zero_bit All f(1) */
-	proto_tree_add_item(h264_nal_tree, hf_h264_forbidden_zero_bit, tvb, offset, 1, FALSE);
+	proto_tree_add_item(h264_nal_tree, hf_h264_forbidden_zero_bit, tvb, offset, 1, ENC_BIG_ENDIAN);
 	/* nal_ref_idc All u(2) */
-	proto_tree_add_item(h264_nal_tree, hf_h264_nal_ref_idc, tvb, offset, 1, FALSE);
+	proto_tree_add_item(h264_nal_tree, hf_h264_nal_ref_idc, tvb, offset, 1, ENC_BIG_ENDIAN);
 	/* nal_unit_type All u(5) */
-	proto_tree_add_item(h264_nal_tree, hf_h264_nal_unit_type, tvb, offset, 1, FALSE);
+	proto_tree_add_item(h264_nal_tree, hf_h264_nal_unit_type, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
 
 	switch(nal_unit_type){
@@ -1745,7 +1745,7 @@ startover:
 		if(tvb_length_remaining(tvb,offset) > 0){
 			/* In this case length = offset as we start from zero */
 			proto_item_set_len(item, offset/*Length */);
-			item = proto_tree_add_item(tree, hf_h264_nal_unit, tvb, offset, -1, FALSE);
+			item = proto_tree_add_item(tree, hf_h264_nal_unit, tvb, offset, -1, ENC_NA);
 			h264_nal_tree = proto_item_add_subtree(item, ett_h264_nal_unit);
 			goto startover;
 		}
@@ -1802,7 +1802,7 @@ dissect_h264(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "H264");
 	if (tree) {
 
-		item = proto_tree_add_item(tree, proto_h264, tvb, 0, -1, FALSE);
+		item = proto_tree_add_item(tree, proto_h264, tvb, 0, -1, ENC_NA);
 		h264_tree = proto_item_add_subtree(item, ett_h264);
 
 		type = tvb_get_guint8(tvb,offset)&0x1f;
@@ -1826,22 +1826,20 @@ dissect_h264(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		 * violations.  A value of 1 indicates that the NAL unit type octet
 		 * and payload may contain bit errors or other syntax violations.
 		 */
-		proto_tree_add_item(h264_nal_tree, hf_h264_nal_f_bit, tvb, offset, 1, FALSE);
-		proto_tree_add_item(h264_nal_tree, hf_h264_nal_nri, tvb, offset, 1, FALSE);
-		if (check_col(pinfo->cinfo, COL_INFO)){
-			col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-				val_to_str(type, h264_type_values, "Unknown Type (%u)"));
-		}
+		proto_tree_add_item(h264_nal_tree, hf_h264_nal_f_bit, tvb, offset, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(h264_nal_tree, hf_h264_nal_nri, tvb, offset, 1, ENC_BIG_ENDIAN);
+		col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+			val_to_str(type, h264_type_values, "Unknown Type (%u)"));
 
-		proto_tree_add_item(h264_nal_tree, hf_h264_type, tvb, offset, 1, FALSE);
+		proto_tree_add_item(h264_nal_tree, hf_h264_type, tvb, offset, 1, ENC_BIG_ENDIAN);
 		offset++;
 		if (type == 28){
 			fua_item = proto_tree_add_text(h264_tree, tvb, offset, 1, "FU Header");
 			fua_tree = proto_item_add_subtree(fua_item, ett_h264_fua);
-			proto_tree_add_item(fua_tree, hf_h264_start_bit, tvb, offset, 1, FALSE);
-			proto_tree_add_item(fua_tree, hf_h264_end_bit, tvb, offset, 1, FALSE);
-			proto_tree_add_item(fua_tree, hf_h264_forbidden_bit, tvb, offset, 1, FALSE);
-			proto_tree_add_item(fua_tree, hf_h264_nal_unit_type, tvb, offset, 1, FALSE);
+			proto_tree_add_item(fua_tree, hf_h264_start_bit, tvb, offset, 1, ENC_BIG_ENDIAN);
+			proto_tree_add_item(fua_tree, hf_h264_end_bit, tvb, offset, 1, ENC_BIG_ENDIAN);
+			proto_tree_add_item(fua_tree, hf_h264_forbidden_bit, tvb, offset, 1, ENC_BIG_ENDIAN);
+			proto_tree_add_item(fua_tree, hf_h264_nal_unit_type, tvb, offset, 1, ENC_BIG_ENDIAN);
 			if ( (tvb_get_guint8(tvb,offset)&0x80) == 0x80 ){
 				type = tvb_get_guint8(tvb,offset)&0x1f;
 				offset++;
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index b7b5e83f84..5130577f94 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -845,8 +845,7 @@ dissect_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tre
   message_class  = tvb_get_guint8(common_header_tvb, MESSAGE_CLASS_OFFSET);
   message_type   = tvb_get_guint8(common_header_tvb, MESSAGE_TYPE_OFFSET);
 
-  if (check_col(pinfo->cinfo, COL_INFO))
-    col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_class * 256 + message_type, support_IG?message_class_type_acro_ig_values:message_class_type_acro_values, "UNKNOWN"));
+  col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_class * 256 + message_type, support_IG?message_class_type_acro_ig_values:message_class_type_acro_values, "UNKNOWN"));
 
   if (iua_tree) {
     /* add the components of the common header to the protocol tree */
@@ -881,8 +880,8 @@ dissect_iua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
   proto_tree *iua_tree;
 
   /* make entry in the Protocol column on summary display */
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, support_IG?"IUA (RFC 3057 + IG)":"IUA (RFC 3057)");
+
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, support_IG?"IUA (RFC 3057 + IG)":"IUA (RFC 3057)");
 
   /* In the interest of speed, if "tree" is NULL, don't do any work not
      necessary to generate protocol tree items. */
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index 20d2b92991..322d427b24 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -354,7 +354,7 @@ static void dissect_iuup_payload(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tr
     guint bit_offset = 0;
     proto_item* pi;
 
-    pi = proto_tree_add_item(tree,hf_iuup_payload,tvb,offset,-1,FALSE);
+    pi = proto_tree_add_item(tree,hf_iuup_payload,tvb,offset,-1,ENC_NA);
 
     if ( ! dissect_fields ) {
         return;
@@ -418,12 +418,12 @@ static guint dissect_rfcis(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tr
 
         DISSECTOR_ASSERT(c < 64);
 
-        pi = proto_tree_add_item(tree,hf_iuup_init_rfci_ind,tvb,*offset,-1,FALSE);
+        pi = proto_tree_add_item(tree,hf_iuup_init_rfci_ind,tvb,*offset,-1,ENC_NA);
         pt = proto_item_add_subtree(pi,ett_rfci);
 
-        proto_tree_add_item(pt,hf_iuup_init_rfci_lri[c],tvb,*offset,1,FALSE);
-        proto_tree_add_item(pt,hf_iuup_init_rfci_li[c],tvb,*offset,1,FALSE);
-        proto_tree_add_item(pt,hf_iuup_init_rfci[c],tvb,*offset,1,FALSE);
+        proto_tree_add_item(pt,hf_iuup_init_rfci_lri[c],tvb,*offset,1,ENC_BIG_ENDIAN);
+        proto_tree_add_item(pt,hf_iuup_init_rfci_li[c],tvb,*offset,1,ENC_BIG_ENDIAN);
+        proto_tree_add_item(pt,hf_iuup_init_rfci[c],tvb,*offset,1,ENC_BIG_ENDIAN);
 
         oct = tvb_get_guint8(tvb,*offset);
         rfci->id = oct & 0x3f;
@@ -499,10 +499,10 @@ static void dissect_iuup_init(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tre
     }
 
     if (tree) {
-        proto_tree_add_item(tree,hf_iuup_spare_e0,tvb,offset,1,FALSE);
-        proto_tree_add_item(tree,hf_iuup_init_ti,tvb,offset,1,FALSE);
-        proto_tree_add_item(tree,hf_iuup_init_subflows_per_rfci,tvb,offset,1,FALSE);
-        proto_tree_add_item(tree,hf_iuup_init_chain_ind,tvb,offset,1,FALSE);
+        proto_tree_add_item(tree,hf_iuup_spare_e0,tvb,offset,1,ENC_BIG_ENDIAN);
+        proto_tree_add_item(tree,hf_iuup_init_ti,tvb,offset,1,ENC_BIG_ENDIAN);
+        proto_tree_add_item(tree,hf_iuup_init_subflows_per_rfci,tvb,offset,1,ENC_BIG_ENDIAN);
+        proto_tree_add_item(tree,hf_iuup_init_chain_ind,tvb,offset,1,ENC_BIG_ENDIAN);
     }
 
     offset++;
@@ -516,7 +516,7 @@ static void dissect_iuup_init(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tre
         iptis_tree = proto_item_add_subtree(pi,ett_ipti);
 
         for (i = 0; i <= rfcis; i++) {
-            proto_tree_add_item(iptis_tree,hf_iuup_init_ipti[i],tvb,offset,1,FALSE);
+            proto_tree_add_item(iptis_tree,hf_iuup_init_ipti[i],tvb,offset,1,ENC_BIG_ENDIAN);
             if ((i%2)) {
                 offset++;
             }
@@ -528,18 +528,18 @@ static void dissect_iuup_init(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tre
     }
 
     if (tree) {
-        pi = proto_tree_add_item(tree,hf_iuup_mode_versions,tvb,offset,2,FALSE);
+        pi = proto_tree_add_item(tree,hf_iuup_mode_versions,tvb,offset,2,ENC_BIG_ENDIAN);
         support_tree = proto_item_add_subtree(pi,ett_support);
 
         for (i = 0; i < 16; i++) {
-            proto_tree_add_item(support_tree,hf_iuup_mode_versions_a[i],tvb,offset,2,FALSE);
+            proto_tree_add_item(support_tree,hf_iuup_mode_versions_a[i],tvb,offset,2,ENC_BIG_ENDIAN);
         }
 
     }
 
     offset += 2;
 
-    proto_tree_add_item(tree,hf_iuup_data_pdu_type,tvb,offset,1,FALSE);
+    proto_tree_add_item(tree,hf_iuup_data_pdu_type,tvb,offset,1,ENC_BIG_ENDIAN);
 
 }
 
@@ -550,12 +550,12 @@ static void dissect_iuup_ratectl(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tr
     proto_tree* inds_tree;
     int offset = 4;
 
-    pi = proto_tree_add_item(tree,hf_iuup_num_rfci_ind,tvb,4,1,FALSE);
+    pi = proto_tree_add_item(tree,hf_iuup_num_rfci_ind,tvb,4,1,ENC_BIG_ENDIAN);
     inds_tree = proto_item_add_subtree(pi,ett_rfciinds);
 
     for (i = 0; i < num; i++) {
         if (! (i % 8) ) offset++;
-        proto_tree_add_item(inds_tree,hf_iuup_rfci_ratectl[i],tvb,offset,1,FALSE);
+        proto_tree_add_item(inds_tree,hf_iuup_rfci_ratectl[i],tvb,offset,1,ENC_BIG_ENDIAN);
     }
 
 }
@@ -564,10 +564,10 @@ static proto_item *add_hdr_crc(tvbuff_t* tvb, packet_info* pinfo, proto_item* iu
 {
     proto_item *crc_item;
     if (crccheck) {
-        crc_item = proto_tree_add_item(iuup_tree,hf_iuup_hdr_crc_error,tvb,2,1,FALSE);
+        crc_item = proto_tree_add_item(iuup_tree,hf_iuup_hdr_crc_error,tvb,2,1,ENC_BIG_ENDIAN);
         expert_add_info_format(pinfo, crc_item, PI_CHECKSUM, PI_ERROR, "Bad checksum");
     } else {
-        crc_item = proto_tree_add_item(iuup_tree,hf_iuup_hdr_crc,tvb,2,1,FALSE);
+        crc_item = proto_tree_add_item(iuup_tree,hf_iuup_hdr_crc,tvb,2,1,ENC_BIG_ENDIAN);
     }
     return crc_item;
 }
@@ -579,10 +579,10 @@ static proto_item *add_payload_crc(tvbuff_t* tvb, packet_info* pinfo, proto_item
     guint16 crc10 = tvb_get_ntohs(tvb, 2) & 0x3FF;
     guint16 crccheck = update_crc10_by_bytes(crc10, tvb_get_ptr(tvb, 4, length - 4), length - 4);
     if (crccheck) {
-        crc_item = proto_tree_add_item(iuup_tree,hf_iuup_payload_crc_error,tvb,2,2,FALSE);
+        crc_item = proto_tree_add_item(iuup_tree,hf_iuup_payload_crc_error,tvb,2,2,ENC_BIG_ENDIAN);
         expert_add_info_format(pinfo, crc_item, PI_CHECKSUM, PI_ERROR, "Bad checksum");
     } else {
-        crc_item = proto_tree_add_item(iuup_tree,hf_iuup_payload_crc,tvb,2,2,FALSE);
+        crc_item = proto_tree_add_item(iuup_tree,hf_iuup_payload_crc,tvb,2,2,ENC_BIG_ENDIAN);
     }
     return crc_item;
 }
@@ -613,8 +613,8 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
 
         phdr = tvb_get_ntohs(tvb,0);
 
-        proto_tree_add_item(tree,hf_iuup_direction,tvb,0,2,FALSE);
-        proto_tree_add_item(tree,hf_iuup_circuit_id,tvb,0,2,FALSE);
+        proto_tree_add_item(tree,hf_iuup_direction,tvb,0,2,ENC_BIG_ENDIAN);
+        proto_tree_add_item(tree,hf_iuup_circuit_id,tvb,0,2,ENC_BIG_ENDIAN);
 
         phdr &= 0x7fff;
 
@@ -631,79 +631,73 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
     pdutype = ( first_octet & PDUTYPE_MASK ) >> 4;
 
     if (tree) {
-        iuup_item = proto_tree_add_item(tree,proto_iuup,tvb,0,-1,FALSE);
+        iuup_item = proto_tree_add_item(tree,proto_iuup,tvb,0,-1,ENC_NA);
         iuup_tree = proto_item_add_subtree(iuup_item,ett_iuup);
 
-        pdutype_item = proto_tree_add_item(iuup_tree,hf_iuup_pdu_type,tvb,0,1,FALSE);
+        pdutype_item = proto_tree_add_item(iuup_tree,hf_iuup_pdu_type,tvb,0,1,ENC_BIG_ENDIAN);
     }
 
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_add_str(pinfo->cinfo, COL_INFO, val_to_str(pdutype, iuup_colinfo_pdu_types, "Unknown PDU Type(%u) "));
-    }
+    col_add_str(pinfo->cinfo, COL_INFO, val_to_str(pdutype, iuup_colinfo_pdu_types, "Unknown PDU Type(%u) "));
 
     switch(pdutype) {
         case PDUTYPE_DATA_WITH_CRC:
-            if (check_col(pinfo->cinfo, COL_INFO)) {
-                col_append_fstr(pinfo->cinfo, COL_INFO,"FN: %x RFCI: %u", (guint)(first_octet & 0x0f) ,(guint)(second_octet & 0x3f));
-            }
+            col_append_fstr(pinfo->cinfo, COL_INFO,"FN: %x RFCI: %u", (guint)(first_octet & 0x0f) ,(guint)(second_octet & 0x3f));
 
             if (!tree) return;
-            proto_tree_add_item(iuup_tree,hf_iuup_frame_number,tvb,0,1,FALSE);
-            pi = proto_tree_add_item(iuup_tree,hf_iuup_fqc,tvb,1,1,FALSE);
+            proto_tree_add_item(iuup_tree,hf_iuup_frame_number,tvb,0,1,ENC_BIG_ENDIAN);
+            pi = proto_tree_add_item(iuup_tree,hf_iuup_fqc,tvb,1,1,ENC_BIG_ENDIAN);
 
             if (first_octet & FQC_MASK) {
                 proto_item_set_expert_flags(pi, PI_RESPONSE_CODE, PI_WARN);
                 proto_item_set_expert_flags(iuup_item, PI_RESPONSE_CODE, PI_WARN);
             }
 
-            proto_tree_add_item(iuup_tree,hf_iuup_rfci,tvb,1,1,FALSE);
+            proto_tree_add_item(iuup_tree,hf_iuup_rfci,tvb,1,1,ENC_BIG_ENDIAN);
             add_hdr_crc(tvb, pinfo, iuup_tree, crccheck);
             add_payload_crc(tvb, pinfo, iuup_tree);
             dissect_iuup_payload(tvb,pinfo,iuup_tree,second_octet & 0x3f,4);
             return;
         case PDUTYPE_DATA_NO_CRC:
-            if (check_col(pinfo->cinfo, COL_INFO)) {
-                col_append_fstr(pinfo->cinfo, COL_INFO," RFCI %u", (guint)(second_octet & 0x3f));
-            }
-            if (!tree) return;
-            proto_tree_add_item(iuup_tree,hf_iuup_frame_number,tvb,0,1,FALSE);
-            pi = proto_tree_add_item(iuup_tree,hf_iuup_fqc,tvb,1,1,FALSE);
+            col_append_fstr(pinfo->cinfo, COL_INFO," RFCI %u", (guint)(second_octet & 0x3f));
+
+			if (!tree) 
+				return;
+            proto_tree_add_item(iuup_tree,hf_iuup_frame_number,tvb,0,1,ENC_BIG_ENDIAN);
+            pi = proto_tree_add_item(iuup_tree,hf_iuup_fqc,tvb,1,1,ENC_BIG_ENDIAN);
 
             if (first_octet & FQC_MASK) {
                 proto_item_set_expert_flags(pi, PI_RESPONSE_CODE, PI_WARN);
                 proto_item_set_expert_flags(iuup_item, PI_RESPONSE_CODE, PI_WARN);
             }
 
-            proto_tree_add_item(iuup_tree,hf_iuup_rfci,tvb,1,1,FALSE);
+            proto_tree_add_item(iuup_tree,hf_iuup_rfci,tvb,1,1,ENC_BIG_ENDIAN);
             add_hdr_crc(tvb, pinfo, iuup_tree, crccheck);
             dissect_iuup_payload(tvb,pinfo,iuup_tree,second_octet & 0x3f,3);
             return;
         case PDUTYPE_DATA_CONTROL_PROC:
             if (tree) {
-                ack_item = proto_tree_add_item(iuup_tree,hf_iuup_ack_nack,tvb,0,1,FALSE);
-                proto_tree_add_item(iuup_tree,hf_iuup_frame_number_t14,tvb,0,1,FALSE);
-                proto_tree_add_item(iuup_tree,hf_iuup_mode_version,tvb,1,1,FALSE);
-                proc_item = proto_tree_add_item(iuup_tree,hf_iuup_procedure_indicator,tvb,1,1,FALSE);
+                ack_item = proto_tree_add_item(iuup_tree,hf_iuup_ack_nack,tvb,0,1,ENC_BIG_ENDIAN);
+                proto_tree_add_item(iuup_tree,hf_iuup_frame_number_t14,tvb,0,1,ENC_BIG_ENDIAN);
+                proto_tree_add_item(iuup_tree,hf_iuup_mode_version,tvb,1,1,ENC_BIG_ENDIAN);
+                proc_item = proto_tree_add_item(iuup_tree,hf_iuup_procedure_indicator,tvb,1,1,ENC_BIG_ENDIAN);
                 add_hdr_crc(tvb, pinfo, iuup_tree, crccheck);
             }
 
-            if (check_col(pinfo->cinfo, COL_INFO)) {
-                col_append_str(pinfo->cinfo, COL_INFO,
-                               val_to_str(first_octet & ACKNACK_MASK,
-                                          iuup_colinfo_acknack_vals, "[action:%u] "));
+            col_append_str(pinfo->cinfo, COL_INFO,
+                           val_to_str(first_octet & ACKNACK_MASK,
+                                      iuup_colinfo_acknack_vals, "[action:%u] "));
 
-                col_append_str(pinfo->cinfo, COL_INFO,
-                               val_to_str(second_octet & PROCEDURE_MASK,
-                                          iuup_colinfo_procedures, "[proc:%u] "));
-            }
+            col_append_str(pinfo->cinfo, COL_INFO,
+                           val_to_str(second_octet & PROCEDURE_MASK,
+                                      iuup_colinfo_procedures, "[proc:%u] "));
 
             switch ( first_octet & ACKNACK_MASK ) {
                 case ACKNACK_ACK:
                     switch(second_octet & PROCEDURE_MASK) {
                         case PROC_INIT:
                             if (!tree) return;
-                            proto_tree_add_item(iuup_tree,hf_iuup_spare_03,tvb,2,1,FALSE);
-                            proto_tree_add_item(iuup_tree,hf_iuup_spare_ff,tvb,3,1,FALSE);
+                            proto_tree_add_item(iuup_tree,hf_iuup_spare_03,tvb,2,1,ENC_BIG_ENDIAN);
+                            proto_tree_add_item(iuup_tree,hf_iuup_spare_ff,tvb,3,1,ENC_BIG_ENDIAN);
                             return;
                         case PROC_RATE:
                             if (!tree) return;
@@ -720,7 +714,7 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
                     break;
                 case ACKNACK_NACK:
                     if (!tree) return;
-                    pi = proto_tree_add_item(iuup_tree,hf_iuup_error_cause_val,tvb,4,1,FALSE);
+                    pi = proto_tree_add_item(iuup_tree,hf_iuup_error_cause_val,tvb,4,1,ENC_BIG_ENDIAN);
                     proto_item_set_expert_flags(pi, PI_RESPONSE_CODE, PI_ERROR);
                     return;
                 case ACKNACK_RESERVED:
@@ -750,7 +744,7 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
 
                     ta = tvb_get_guint8(tvb,4);
 
-                    pi = proto_tree_add_item(iuup_tree,hf_iuup_time_align,tvb,4,1,FALSE);
+                    pi = proto_tree_add_item(iuup_tree,hf_iuup_time_align,tvb,4,1,ENC_BIG_ENDIAN);
                     time_tree = proto_item_add_subtree(pi,ett_time);
 
                     if (ta >= 1 && ta <= 80) {
@@ -767,18 +761,18 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
                         proto_item_set_expert_flags(pi, PI_MALFORMED, PI_ERROR);
                     }
 
-                    proto_tree_add_item(iuup_tree,hf_iuup_spare_bytes,tvb,5,-1,FALSE);
+                    proto_tree_add_item(iuup_tree,hf_iuup_spare_bytes,tvb,5,-1,ENC_NA);
                     return;
                 }
                 case PROC_ERROR:
-                    if (check_col(pinfo->cinfo, COL_INFO)) {
-                        col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(tvb,4) & 0x3f,iuup_error_causes,"Unknown (%u)"));
-                    }
-                    if (!tree) return;
-                    proto_tree_add_item(iuup_tree,hf_iuup_error_distance,tvb,4,1,FALSE);
-                    pi = proto_tree_add_item(iuup_tree,hf_iuup_errorevt_cause_val,tvb,4,1,FALSE);
+                    col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(tvb,4) & 0x3f,iuup_error_causes,"Unknown (%u)"));
+
+					if (!tree) 
+						return;
+                    proto_tree_add_item(iuup_tree,hf_iuup_error_distance,tvb,4,1,ENC_BIG_ENDIAN);
+                    pi = proto_tree_add_item(iuup_tree,hf_iuup_errorevt_cause_val,tvb,4,1,ENC_BIG_ENDIAN);
                     proto_item_set_expert_flags(pi, PI_RESPONSE_CODE, PI_ERROR);
-                    proto_tree_add_item(iuup_tree,hf_iuup_spare_bytes,tvb,5,-1,FALSE);
+                    proto_tree_add_item(iuup_tree,hf_iuup_spare_bytes,tvb,5,-1,ENC_NA);
                     return;
                 default: /* bad */
                     if (!tree) return;
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index cf2ff1b0b1..b327987b9f 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -648,7 +648,7 @@ dissect_q932_facility_ie(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
   tvbuff_t *next_tvb;
 
   ie_end = offset + length;
-  proto_tree_add_item(tree, hf_q932_pp, tvb, offset, 1, FALSE);
+  proto_tree_add_item(tree, hf_q932_pp, tvb, offset, 1, ENC_BIG_ENDIAN);
   offset++;
   while (offset < ie_end) {
     hoffset = offset;
@@ -749,7 +749,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   offset = 0;
 
-  ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, FALSE);
+  ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, ENC_NA);
   PROTO_ITEM_SET_HIDDEN(ti);
 
   ie_type = tvb_get_guint8(tvb, offset);
@@ -758,8 +758,8 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   ti_ie = proto_tree_add_text(tree, tvb, offset, -1, "%s",
             val_to_str(ie_type, VALS(q932_str_ie_type), "unknown (0x%02X)"));
   ie_tree = proto_item_add_subtree(ti_ie, ett_q932_ie); 
-  proto_tree_add_item(ie_tree, hf_q932_ie_type, tvb, offset, 1, FALSE);
-  proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, FALSE);
+  proto_tree_add_item(ie_tree, hf_q932_ie_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+  proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
   offset += 2;
   if (tvb_length_remaining(tvb, offset) <= 0)
     return;
@@ -772,7 +772,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
       break;
     default:
       if (ie_len > 0) {
-        if (tree) proto_tree_add_item(ie_tree, hf_q932_ie_data, tvb, offset, ie_len, FALSE);
+        if (tree) proto_tree_add_item(ie_tree, hf_q932_ie_data, tvb, offset, ie_len, ENC_NA);
       }
   }
 }
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index 8f67d41d57..ccedd97327 100644
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -5305,10 +5305,9 @@ dissect_rnsap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
                                                             0U, 255U, &ProcedureCode, FALSE);
 
 #line 77 "../../asn1/rnsap/rnsap.cnf"
-	if (check_col(actx->pinfo->cinfo, COL_INFO))
-       col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
-                   val_to_str_ext_const(ProcedureCode, &rnsap_ProcedureCode_vals_ext,
-                              "unknown message"));
+   col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
+                val_to_str_ext_const(ProcedureCode, &rnsap_ProcedureCode_vals_ext,
+                           "unknown message"));
 
   return offset;
 }
@@ -5339,7 +5338,7 @@ static const per_sequence_t ProcedureID_sequence[] = {
 
 static int
 dissect_rnsap_ProcedureID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 85 "../../asn1/rnsap/rnsap.cnf"
+#line 84 "../../asn1/rnsap/rnsap.cnf"
   ProcedureCode = 0xFFFF;
   ddMode = 0xFFFF;
   ProcedureID = NULL;
@@ -5347,7 +5346,7 @@ dissect_rnsap_ProcedureID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rnsap_ProcedureID, ProcedureID_sequence);
 
-#line 91 "../../asn1/rnsap/rnsap.cnf"
+#line 90 "../../asn1/rnsap/rnsap.cnf"
   ProcedureID = ep_strdup_printf("%s/%s",
                                  val_to_str_ext(ProcedureCode, &rnsap_ProcedureCode_vals_ext, "unknown(%u)"),
                                  val_to_str(ddMode, rnsap_DdMode_vals, "unknown(%u)"));
@@ -22926,7 +22925,7 @@ dissect_rnsap_List_Of_PLMNs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 static int
 dissect_rnsap_L3_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 104 "../../asn1/rnsap/rnsap.cnf"
+#line 103 "../../asn1/rnsap/rnsap.cnf"
 	tvbuff_t *parameter_tvb;
 	dissector_handle_t parameter_handle = NULL;
 
@@ -43148,7 +43147,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "RNSAP");
 
 	/* create the rnsap protocol tree */
-	rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, FALSE);
+	rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, ENC_NA);
 	rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap);
 	
 	dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree);
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index 97c3551a75..950e3109b7 100644
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -306,7 +306,7 @@ dissect_rtse_T_t61String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
                                             actx, tree, tvb, offset, hf_index,
                                             &string);
 
-  if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request && string)
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s", tvb_format_text(string, 0, tvb_length(string)));
 
 
@@ -323,7 +323,7 @@ dissect_rtse_T_octetString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
     offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &string);
 
-  if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request && string)
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s", tvb_format_text(string, 0, tvb_length(string)));
 
 
@@ -361,7 +361,7 @@ dissect_rtse_CommonReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
   tvbuff_t *string = NULL;
     offset = dissect_ber_UTCTime(implicit_tag, actx, tree, tvb, offset, hf_index);
 
-  if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request && string)
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s", tvb_format_text(string, 0, tvb_length(string)));
 
 
@@ -391,7 +391,7 @@ static const ber_sequence_t SessionConnectionIdentifier_sequence[] = {
 static int
 dissect_rtse_SessionConnectionIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 101 "../../asn1/rtse/rtse.cnf"
-  if(open_request && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request)
     col_append_str(actx->pinfo->cinfo, COL_INFO, "Recover");
     offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    SessionConnectionIdentifier_sequence, hf_index, ett_rtse_SessionConnectionIdentifier);
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index ca6bec2197..7fed4833a8 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -426,8 +426,7 @@ force_reassemble_seq(packet_info *pinfo, guint32 id,
 	fd_head->flags |= FD_DEFRAGMENTED;
 	fd_head->reassembled_in=pinfo->fd->num;
 
-	if (check_col(pinfo->cinfo, COL_INFO))
-			col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost);
+	col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost);
 	
 	p_t38_packet_conv_info->packet_lost = packet_lost;
 	p_t38_packet_conv_info->burst_lost = burst_lost;
@@ -474,7 +473,7 @@ dissect_t38_T30_indicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
                                      16, &T30ind_value, TRUE, 7, NULL);
 
 #line 31 "../../asn1/t38/t38.cnf"
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " t30ind: %s",
          val_to_str(T30ind_value,t38_T30_indicator_vals,"<unknown>"));
     }
@@ -513,7 +512,7 @@ dissect_t38_T30_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
                                      9, &Data_value, TRUE, 6, NULL);
 
 #line 43 "../../asn1/t38/t38.cnf"
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " data:%s:",
          val_to_str(Data_value,t38_T30_data_vals,"<unknown>"));
     }
@@ -577,7 +576,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
                                      8, &Data_Field_field_type_value, (use_pre_corrigendum_asn1_specification)?FALSE:TRUE, (use_pre_corrigendum_asn1_specification)?0:4, NULL);
 
 #line 63 "../../asn1/t38/t38.cnf"
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s",
          val_to_str(Data_Field_field_type_value,t38_T_field_type_vals,"<unknown>"));
     }
@@ -683,7 +682,7 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 
 
 #line 159 "../../asn1/t38/t38.cnf"
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         if(value_len < 8){
             col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]",
                tvb_bytes_to_str(value_tvb,0,value_len));
@@ -731,11 +730,9 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 
             if (!frag_msg) { /* Not last packet of reassembled */
                 if (Data_Field_field_type_value == 0) {
-                    if (check_col(actx->pinfo->cinfo, COL_INFO))
-                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                    col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
                 } else {
-                    if (check_col(actx->pinfo->cinfo, COL_INFO))
-                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                    col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
                 }
             }
 
@@ -800,14 +797,12 @@ dissect_t38_T_seq_number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, 65535U, &seq_number, FALSE);
 
-#line 229 "../../asn1/t38/t38.cnf"
+#line 227 "../../asn1/t38/t38.cnf"
     /* info for tap */
     if (primary_part)
         t38_info->seq_num = seq_number;
 
-      if (check_col(actx->pinfo->cinfo, COL_INFO)){
-        col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number);
-    }
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number);
 
   return offset;
 }
@@ -816,12 +811,12 @@ dissect_t38_T_seq_number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 
 static int
 dissect_t38_T_primary_ifp_packet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 239 "../../asn1/t38/t38.cnf"
+#line 235 "../../asn1/t38/t38.cnf"
     primary_part = TRUE;
 
   offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_t38_IFPPacket);
 
-#line 241 "../../asn1/t38/t38.cnf"
+#line 237 "../../asn1/t38/t38.cnf"
     /* if is a valid t38 packet, add to tap */
     if (p_t38_packet_conv && (!actx->pinfo->in_error_pkt) && ((gint32) seq_number != p_t38_packet_conv_info->last_seqnum))
         tap_queue_packet(t38_tap, actx->pinfo, t38_info);
@@ -915,14 +910,14 @@ static const per_choice_t T_error_recovery_choice[] = {
 
 static int
 dissect_t38_T_error_recovery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 249 "../../asn1/t38/t38.cnf"
+#line 245 "../../asn1/t38/t38.cnf"
     primary_part = FALSE;
 
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_t38_T_error_recovery, T_error_recovery_choice,
                                  NULL);
 
-#line 251 "../../asn1/t38/t38.cnf"
+#line 247 "../../asn1/t38/t38.cnf"
     primary_part = TRUE;
 
   return offset;
@@ -938,7 +933,7 @@ static const per_sequence_t UDPTLPacket_sequence[] = {
 
 static int
 dissect_t38_UDPTLPacket(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 223 "../../asn1/t38/t38.cnf"
+#line 221 "../../asn1/t38/t38.cnf"
     /* Initialize to something else than data type */
     Data_Field_field_type_value = 1;
 
@@ -969,7 +964,7 @@ static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
 
 
 /*--- End of included file: packet-t38-fn.c ---*/
-#line 395 "../../asn1/t38/packet-t38-template.c"
+#line 394 "../../asn1/t38/packet-t38-template.c"
 
 /* initialize the tap t38_info and the conversation */
 static void
@@ -1168,11 +1163,8 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				}
 				col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]");
 				break;
-			} 
-			else {
-				if (check_col(pinfo->cinfo, COL_INFO)){
-					col_append_fstr(pinfo->cinfo, COL_INFO, " IFPPacket#%u",ifp_packet_number);
-				}
+			}else {
+				col_append_fstr(pinfo->cinfo, COL_INFO, " IFPPacket#%u",ifp_packet_number);
 			}
 		}
 	}
@@ -1324,7 +1316,7 @@ proto_register_t38(void)
         "OCTET_STRING", HFILL }},
 
 /*--- End of included file: packet-t38-hfarr.c ---*/
-#line 673 "../../asn1/t38/packet-t38-template.c"
+#line 669 "../../asn1/t38/packet-t38-template.c"
 		{   &hf_t38_setup,
 		    { "Stream setup", "t38.setup", FT_STRING, BASE_NONE,
 		    NULL, 0x0, "Stream setup, method and frame number", HFILL }},
@@ -1385,7 +1377,7 @@ proto_register_t38(void)
     &ett_t38_T_fec_data,
 
 /*--- End of included file: packet-t38-ettarr.c ---*/
-#line 720 "../../asn1/t38/packet-t38-template.c"
+#line 716 "../../asn1/t38/packet-t38-template.c"
 		&ett_t38_setup,
 		&ett_data_fragment,
 		&ett_data_fragments
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 3806596831..af9094b5ba 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -762,7 +762,7 @@ if (parameter_tvb){
 		break;
 	}
 
-	if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
+	if (len){
 		col_append_str(actx->pinfo->cinfo, COL_INFO, "otid(");
 	   	for(i=0;i<len;i++)
         		  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%02x",tvb_get_guint8(parameter_tvb,i));
@@ -797,8 +797,7 @@ gp_tcapsrt_info->ope=TC_BEGIN;
  *  If there's something there that should not be overwritten, whoever
  *  put that info there should call col_set_fence() to protect it.
  */
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    Begin_sequence, hf_index, ett_tcap_Begin);
@@ -838,7 +837,7 @@ if (parameter_tvb){
 		break;
 	}
 
-	if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
+	if (len){
 		col_append_str(actx->pinfo->cinfo, COL_INFO, "dtid(");
 		for(i=0;i<len;i++)
           		col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%02x",tvb_get_guint8(parameter_tvb,i));
@@ -860,11 +859,10 @@ static const ber_sequence_t End_sequence[] = {
 
 static int
 dissect_tcap_End(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 206 "../../asn1/tcap/tcap.cnf"
+#line 205 "../../asn1/tcap/tcap.cnf"
 gp_tcapsrt_info->ope=TC_END;
 
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "End ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "End ");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    End_sequence, hf_index, ett_tcap_End);
@@ -883,11 +881,10 @@ static const ber_sequence_t Continue_sequence[] = {
 
 static int
 dissect_tcap_Continue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 214 "../../asn1/tcap/tcap.cnf"
+#line 212 "../../asn1/tcap/tcap.cnf"
 gp_tcapsrt_info->ope=TC_CONT;
 
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    Continue_sequence, hf_index, ett_tcap_Continue);
@@ -955,11 +952,10 @@ static const ber_sequence_t Abort_sequence[] = {
 
 static int
 dissect_tcap_Abort(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 222 "../../asn1/tcap/tcap.cnf"
+#line 219 "../../asn1/tcap/tcap.cnf"
 gp_tcapsrt_info->ope=TC_ABORT;
 
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    Abort_sequence, hf_index, ett_tcap_Abort);
@@ -1484,7 +1480,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
     /* create display subtree for the protocol */
     if(parent_tree){
-      item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, FALSE);
+      item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, ENC_NA);
       tree = proto_item_add_subtree(item, ett_tcap);
       tcap_stat_tree=tree;
     }
diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c
index 17ca1ed8b7..24a96159a8 100644
--- a/epan/dissectors/packet-tetra.c
+++ b/epan/dissectors/packet-tetra.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-tetra.c                                                             */
-/* ../../../tools/asn2wrs.py -u -p tetra -c ../../../asn1/tetra/tetra.cnf -s ../../../asn1/tetra/packet-tetra-template -D ../../../asn1/tetra tetra.asn */
+/* ../../tools/asn2wrs.py -u -p tetra -c ./tetra.cnf -s ./packet-tetra-template -D . tetra.asn */
 
 /* Input file: packet-tetra-template.c */
 
@@ -2528,13 +2528,11 @@ static const per_sequence_t U_LOCATION_UPDATE_DEMAND_sequence[] = {
 
 int
 dissect_tetra_U_LOCATION_UPDATE_DEMAND(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 101 "../../asn1/tetra/tetra.cnf"
+#line 93 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_LOCATION_UPDATE_DEMAND, U_LOCATION_UPDATE_DEMAND_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-LOCATION-UPDATE-DEMAND");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-LOCATION-UPDATE-DEMAND");
 
 
   return offset;
@@ -2565,13 +2563,11 @@ static const per_sequence_t U_MM_STATUS_sequence[] = {
 
 int
 dissect_tetra_U_MM_STATUS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 288 "../../asn1/tetra/tetra.cnf"
+#line 229 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_MM_STATUS, U_MM_STATUS_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
 
 
   return offset;
@@ -2794,13 +2790,11 @@ static const per_sequence_t U_ATTACH_DETACH_GROUP_IDENTITY_sequence[] = {
 
 int
 dissect_tetra_U_ATTACH_DETACH_GROUP_IDENTITY(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 302 "../../asn1/tetra/tetra.cnf"
+#line 239 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_ATTACH_DETACH_GROUP_IDENTITY, U_ATTACH_DETACH_GROUP_IDENTITY_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
 
 
   return offset;
@@ -2891,13 +2885,11 @@ static const per_sequence_t U_ATTACH_DETACH_GROUP_IDENTITY_ACK_sequence[] = {
 
 int
 dissect_tetra_U_ATTACH_DETACH_GROUP_IDENTITY_ACK(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 309 "../../asn1/tetra/tetra.cnf"
+#line 244 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_ATTACH_DETACH_GROUP_IDENTITY_ACK, U_ATTACH_DETACH_GROUP_IDENTITY_ACK_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
 		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY-ACK");
-	}
 
 
   return offset;
@@ -3185,13 +3177,11 @@ static const per_sequence_t U_ALERT_sequence[] = {
 
 int
 dissect_tetra_U_ALERT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 217 "../../asn1/tetra/tetra.cnf"
+#line 178 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_ALERT, U_ALERT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ALERT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ALERT");
 
 
   return offset;
@@ -3305,13 +3295,11 @@ static const per_sequence_t U_CONNECT_sequence[] = {
 
 int
 dissect_tetra_U_CONNECT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 224 "../../asn1/tetra/tetra.cnf"
+#line 183 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_CONNECT, U_CONNECT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CONNECT");
 
 
   return offset;
@@ -3395,13 +3383,11 @@ static const per_sequence_t U_DISCONNECT_sequence[] = {
 
 int
 dissect_tetra_U_DISCONNECT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 231 "../../asn1/tetra/tetra.cnf"
+#line 188 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_DISCONNECT, U_DISCONNECT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-DISCONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-DISCONNECT");
 
 
   return offset;
@@ -3435,15 +3421,11 @@ dissect_tetra_U_RELEASE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_RELEASE, U_RELEASE_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_RELEASE, U_RELEASE_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
 
 
   return offset;
@@ -3610,13 +3592,11 @@ static const per_sequence_t U_SETUP_sequence[] = {
 
 int
 dissect_tetra_U_SETUP(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 245 "../../asn1/tetra/tetra.cnf"
+#line 198 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_SETUP, U_SETUP_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SETUP");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SETUP");
 
 
   return offset;
@@ -3668,13 +3648,11 @@ static const per_sequence_t U_STATUS_sequence[] = {
 
 int
 dissect_tetra_U_STATUS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 252 "../../asn1/tetra/tetra.cnf"
+#line 203 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_STATUS, U_STATUS_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-STATUS");
 
 
   return offset;
@@ -3747,13 +3725,11 @@ static const per_sequence_t U_TX_CEASED_sequence[] = {
 
 int
 dissect_tetra_U_TX_CEASED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 280 "../../asn1/tetra/tetra.cnf"
+#line 223 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_TX_CEASED, U_TX_CEASED_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-CEASED");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-CEASED");
 
 
   return offset;
@@ -3829,13 +3805,11 @@ static const per_sequence_t U_TX_DEMAND_sequence[] = {
 
 int
 dissect_tetra_U_TX_DEMAND(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 273 "../../asn1/tetra/tetra.cnf"
+#line 218 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_TX_DEMAND, U_TX_DEMAND_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-DEMAND");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-DEMAND");
 
 
   return offset;
@@ -3920,13 +3894,11 @@ static const per_sequence_t U_CALL_RESTORE_sequence[] = {
 
 int
 dissect_tetra_U_CALL_RESTORE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 266 "../../asn1/tetra/tetra.cnf"
+#line 213 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_CALL_RESTORE, U_CALL_RESTORE_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CALL-RESTORE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CALL-RESTORE");
 
 
   return offset;
@@ -4014,13 +3986,11 @@ static const per_sequence_t U_SDS_DATA_sequence[] = {
 
 int
 dissect_tetra_U_SDS_DATA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 259 "../../asn1/tetra/tetra.cnf"
+#line 208 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_U_SDS_DATA, U_SDS_DATA_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SDS-DATA");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SDS-DATA");
 
 
   return offset;
@@ -6134,13 +6104,11 @@ static const per_sequence_t D_LOCATION_UPDATE_ACCEPT_sequence[] = {
 
 int
 dissect_tetra_D_LOCATION_UPDATE_ACCEPT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 109 "../../asn1/tetra/tetra.cnf"
+#line 99 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_LOCATION_UPDATE_ACCEPT, D_LOCATION_UPDATE_ACCEPT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-LOCATION-UPDATE-ACCEPT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-LOCATION-UPDATE-ACCEPT");
 
 
   return offset;
@@ -6156,13 +6124,11 @@ static const per_sequence_t D_LOCATION_UPDATE_REJECT_sequence[] = {
 
 int
 dissect_tetra_D_LOCATION_UPDATE_REJECT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 316 "../../asn1/tetra/tetra.cnf"
+#line 249 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_LOCATION_UPDATE_REJECT, D_LOCATION_UPDATE_REJECT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
 		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-LOCATION-UPDATE-REJECT");
-	}
 
 
   return offset;
@@ -6377,13 +6343,11 @@ static const per_sequence_t D_ATTACH_DETACH_GROUP_IDENTITY_sequence[] = {
 
 int
 dissect_tetra_D_ATTACH_DETACH_GROUP_IDENTITY(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 323 "../../asn1/tetra/tetra.cnf"
+#line 254 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_ATTACH_DETACH_GROUP_IDENTITY, D_ATTACH_DETACH_GROUP_IDENTITY_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
 
 
   return offset;
@@ -6474,13 +6438,11 @@ static const per_sequence_t D_ATTACH_DETACH_GROUP_IDENTITY_ACK_sequence[] = {
 
 int
 dissect_tetra_D_ATTACH_DETACH_GROUP_IDENTITY_ACK(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 330 "../../asn1/tetra/tetra.cnf"
+#line 259 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_ATTACH_DETACH_GROUP_IDENTITY_ACK, D_ATTACH_DETACH_GROUP_IDENTITY_ACK_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY-ACK");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY-ACK");
 
 
   return offset;
@@ -6494,13 +6456,11 @@ static const per_sequence_t D_MM_STATUS_sequence[] = {
 
 int
 dissect_tetra_D_MM_STATUS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 295 "../../asn1/tetra/tetra.cnf"
+#line 234 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_MM_STATUS, D_MM_STATUS_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
 
 
   return offset;
@@ -6689,13 +6649,11 @@ static const per_sequence_t D_ALERT_sequence[] = {
 
 int
 dissect_tetra_D_ALERT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 152 "../../asn1/tetra/tetra.cnf"
+#line 130 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_ALERT, D_ALERT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-ALERT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-ALERT");
 
 
   return offset;
@@ -6840,13 +6798,11 @@ static const per_sequence_t D_CALL_PROCEEDING_sequence[] = {
 
 int
 dissect_tetra_D_CALL_PROCEEDING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 86 "../../asn1/tetra/tetra.cnf"
+#line 82 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_CALL_PROCEEDING, D_CALL_PROCEEDING_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-PROCEEDING");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-PROCEEDING");
 
 
   return offset;
@@ -7033,13 +6989,11 @@ static const per_sequence_t D_CONNECT_sequence[] = {
 
 int
 dissect_tetra_D_CONNECT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 117 "../../asn1/tetra/tetra.cnf"
+#line 105 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_CONNECT, D_CONNECT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT");
 
 
   return offset;
@@ -7138,13 +7092,11 @@ static const per_sequence_t D_CONNECT_ACK_sequence[] = {
 
 int
 dissect_tetra_D_CONNECT_ACK(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 131 "../../asn1/tetra/tetra.cnf"
+#line 115 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_CONNECT_ACK, D_CONNECT_ACK_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT-ACK");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT-ACK");
 
 
   return offset;
@@ -7159,13 +7111,11 @@ static const per_sequence_t D_DISCONNECT_sequence[] = {
 
 int
 dissect_tetra_D_DISCONNECT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 145 "../../asn1/tetra/tetra.cnf"
+#line 125 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_DISCONNECT, D_DISCONNECT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-DISCONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-DISCONNECT");
 
 
   return offset;
@@ -7181,13 +7131,11 @@ static const per_sequence_t D_INFO_sequence[] = {
 
 int
 dissect_tetra_D_INFO(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 138 "../../asn1/tetra/tetra.cnf"
+#line 120 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_INFO, D_INFO_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-INFO");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-INFO");
 
 
   return offset;
@@ -7284,19 +7232,15 @@ static const per_sequence_t D_RELEASE_sequence[] = {
 
 int
 dissect_tetra_D_RELEASE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 77 "../../asn1/tetra/tetra.cnf"
+#line 75 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_RELEASE, D_RELEASE_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_RELEASE, D_RELEASE_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
 
 
   return offset;
@@ -7438,13 +7382,11 @@ static const per_sequence_t D_SETUP_sequence[] = {
 
 int
 dissect_tetra_D_SETUP(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 93 "../../asn1/tetra/tetra.cnf"
+#line 87 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_SETUP, D_SETUP_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SETUP");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SETUP");
 
 
   return offset;
@@ -7495,13 +7437,11 @@ static const per_sequence_t D_STATUS_sequence[] = {
 
 int
 dissect_tetra_D_STATUS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 167 "../../asn1/tetra/tetra.cnf"
+#line 141 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_STATUS, D_STATUS_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-STATUS");
 
 
   return offset;
@@ -7598,13 +7538,11 @@ static const per_sequence_t D_TX_CEASED_sequence[] = {
 
 int
 dissect_tetra_D_TX_CEASED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 159 "../../asn1/tetra/tetra.cnf"
+#line 135 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_TX_CEASED, D_TX_CEASED_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CEASED");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CEASED");
 
 
   return offset;
@@ -7620,13 +7558,11 @@ static const per_sequence_t D_TX_CONTINUE_sequence[] = {
 
 int
 dissect_tetra_D_TX_CONTINUE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 174 "../../asn1/tetra/tetra.cnf"
+#line 146 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_TX_CONTINUE, D_TX_CONTINUE_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CONTINUE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CONTINUE");
 
 
   return offset;
@@ -7644,13 +7580,12 @@ static const per_sequence_t D_TX_GRANTED_sequence[] = {
 
 int
 dissect_tetra_D_TX_GRANTED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 181 "../../asn1/tetra/tetra.cnf"
+#line 151 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_TX_GRANTED, D_TX_GRANTED_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-GRANTED");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-GRANTED");
+
 
 
   return offset;
@@ -7665,19 +7600,15 @@ static const per_sequence_t D_TX_WAIT_sequence[] = {
 
 int
 dissect_tetra_D_TX_WAIT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 188 "../../asn1/tetra/tetra.cnf"
+#line 157 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_TX_WAIT, D_TX_WAIT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_TX_WAIT, D_TX_WAIT_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
 
 
   return offset;
@@ -7899,13 +7830,11 @@ static const per_sequence_t D_CALL_RESTORE_sequence[] = {
 
 int
 dissect_tetra_D_CALL_RESTORE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 195 "../../asn1/tetra/tetra.cnf"
+#line 162 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_CALL_RESTORE, D_CALL_RESTORE_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-RESTORE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-RESTORE");
 
 
   return offset;
@@ -7982,13 +7911,11 @@ static const per_sequence_t D_SDS_DATA_sequence[] = {
 
 int
 dissect_tetra_D_SDS_DATA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 202 "../../asn1/tetra/tetra.cnf"
+#line 167 "../../asn1/tetra/tetra.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_tetra_D_SDS_DATA, D_SDS_DATA_sequence);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SDS-DATA");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SDS-DATA");
 
 
   return offset;
@@ -9035,7 +8962,7 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre
 	guint8 p;
 
 	tetra_sub_item = proto_tree_add_item(tree, hf_tetra_pdu,
-					     pdu, 0, tvb_length(pdu), FALSE);
+					     pdu, 0, tvb_length(pdu), ENC_NA);
 
 	tetra_sub_tree = proto_item_add_subtree(tetra_sub_item, ett_tetra);
 
@@ -9296,7 +9223,7 @@ dissect_tetra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		guint32 txtimer = 0;
 		guint32 tslot = 0;
 
-		tetra_item = proto_tree_add_item(tree, proto_tetra, tvb, 0, -1, FALSE);
+		tetra_item = proto_tree_add_item(tree, proto_tetra, tvb, 0, -1, ENC_NA);
 		tetra_tree = proto_item_add_subtree(tetra_item, ett_tetra);
 		tetra_header_tree = proto_item_add_subtree(tetra_item, ett_tetra);