diff --git a/core/Bitstring.cc b/core/Bitstring.cc
index 170e66823bbf4ae37ac1112ce202a787fca1ae90..9e15708665d9d2a0188d9de429db6cdb129440b1 100644
--- a/core/Bitstring.cc
+++ b/core/Bitstring.cc
@@ -1011,12 +1011,10 @@ int BITSTRING::RAW_encode(const TTCN_Typedescriptor_t& p_td, RAW_enc_tree& mylea
   myleaf.must_free = FALSE;
   myleaf.data_ptr_used = TRUE;
   myleaf.body.leaf.data_ptr = val_ptr->bits_ptr;
-  boolean orders = FALSE;
-  if (p_td.raw->byteorder       == ORDER_MSB) orders = TRUE;
+  boolean orders = p_td.raw->byteorder == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_LSB) orders = !orders;
   myleaf.coding_par.byteorder = orders ? ORDER_MSB : ORDER_LSB;
-  orders = FALSE;
-  if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+  orders = p_td.raw->bitorderinoctet == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_LSB) orders = !orders;
   myleaf.coding_par.bitorder = orders ? ORDER_MSB : ORDER_LSB;
   myleaf.coding_par.csn1lh = p_td.raw->csn1lh;
@@ -1046,12 +1044,10 @@ int BITSTRING::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
   clean_up();
   init_struct(decode_length);
   RAW_coding_par cp;
-  boolean orders = FALSE;
-  if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+  boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_LSB) orders = !orders;
   cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
-  orders = FALSE;
-  if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+  orders = p_td.raw->byteorder == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_LSB) orders = !orders;
   cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
   cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Boolean.cc b/core/Boolean.cc
index dc6162602a9de90b7d033c87155bfa8249ca5149..36540c53513aad1759df84973c046a0b334d60ce 100644
--- a/core/Boolean.cc
+++ b/core/Boolean.cc
@@ -609,12 +609,10 @@ int BOOLEAN::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
   else if (decode_length == 0) boolean_value = FALSE;
   else {
     RAW_coding_par cp;
-    boolean orders = FALSE;
-    if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+    boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
     if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
     cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
-    orders = FALSE;
-    if (p_td.raw->byteorder       == ORDER_MSB) orders = TRUE;
+    orders = p_td.raw->byteorder == ORDER_MSB;
     if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
     cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
     cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Charstring.cc b/core/Charstring.cc
index 53a933a660af0ffdaf150c35e14fd2966d6ffa5e..7bd197d9239037a8dc21b5fdae5bb69feb13fdee 100644
--- a/core/Charstring.cc
+++ b/core/Charstring.cc
@@ -1580,12 +1580,10 @@ int CHARSTRING::RAW_decode(const TTCN_Typedescriptor_t& p_td,
     decode_length = ((limit > (int) buff.unread_len_bit() ? (int)buff.unread_len_bit() : limit) / 8) * 8;
   }
   RAW_coding_par cp;
-  boolean orders = FALSE;
-  if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+  boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
-  orders = FALSE;
-  if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+  orders = p_td.raw->byteorder == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
   cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Float.cc b/core/Float.cc
index 53f18f3427ceaad1c94c4b43d41bb523af5cefe6..ccd41a746d78d5322c5b3abf854211c714c1c3b8 100644
--- a/core/Float.cc
+++ b/core/Float.cc
@@ -791,12 +791,10 @@ int FLOAT::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
   double tmp = 0.0;
   unsigned char data[16];
   RAW_coding_par cp;
-  boolean orders = FALSE;
-  if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+  boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
-  orders = FALSE;
-  if (p_td.raw->byteorder       == ORDER_MSB) orders = TRUE;
+  orders = p_td.raw->byteorder == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
   cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Hexstring.cc b/core/Hexstring.cc
index c6999913d46fdc86e1f9b37a81ef33872ea5316a..778e276e19dbf355b45982bc7f0616c21f1a29b0 100644
--- a/core/Hexstring.cc
+++ b/core/Hexstring.cc
@@ -805,12 +805,10 @@ int HEXSTRING::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
       ? (int)buff.unread_len_bit() : limit) / 4) * 4;
   }
   RAW_coding_par cp;
-  boolean orders = FALSE;
-  if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+  boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
-  orders = FALSE;
-  if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+  orders = p_td.raw->byteorder == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
   cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Integer.cc b/core/Integer.cc
index 2b22bde06488bd72aa110c2da22cc568486bce27..58c7c4d1e905cd3b137f79daafc168ba36ee5161 100644
--- a/core/Integer.cc
+++ b/core/Integer.cc
@@ -1420,12 +1420,10 @@ int INTEGER::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
   int prepaddlength = buff.increase_pos_padd(p_td.raw->prepadding);
   limit -= prepaddlength;
   RAW_coding_par cp;
-  boolean orders = FALSE;
-  if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+  boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
-  orders = FALSE;
-  if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+  orders = p_td.raw->byteorder == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
   cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Octetstring.cc b/core/Octetstring.cc
index dd62080cb61437d83362f9b9a82455fb5f0af458..0d2228a42b3d04d576e463afc8f63b370e7f11b1 100644
--- a/core/Octetstring.cc
+++ b/core/Octetstring.cc
@@ -1255,12 +1255,10 @@ int OCTETSTRING::RAW_decode(const TTCN_Typedescriptor_t& p_td,
       ? (int)buff.unread_len_bit() : limit) / 8) * 8;
   }
   RAW_coding_par cp;
-  boolean orders = FALSE;
-  if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+  boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
-  orders = FALSE;
-  if (p_td.raw->byteorder       == ORDER_MSB) orders = TRUE;
+  orders = p_td.raw->byteorder == ORDER_MSB;
   if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
   cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
   cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/RAW.cc b/core/RAW.cc
index f417734e8ba60fabb94440db7c147ee6273401f4..0742125a8359cad345e3a558f3863f192a0dc13c 100644
--- a/core/RAW.cc
+++ b/core/RAW.cc
@@ -157,7 +157,6 @@ const unsigned char BitMaskTable[9]={
 RAW_enc_tree::RAW_enc_tree(boolean is_leaf, RAW_enc_tree *par,
   RAW_enc_tr_pos *par_pos, int my_pos, const TTCN_RAWdescriptor_t *raw_attr)
 {
-  boolean orders = FALSE;
   isleaf = is_leaf;
   must_free = FALSE;
   data_ptr_used = FALSE;
@@ -182,11 +181,10 @@ RAW_enc_tree::RAW_enc_tree(boolean is_leaf, RAW_enc_tree *par,
   ext_bit = raw_attr->extension_bit;
   top_bit_order = raw_attr->top_bit_order;
   calc = CALC_NO;
-  if (raw_attr->byteorder == ORDER_MSB) orders = TRUE;
+  boolean orders = raw_attr->byteorder == ORDER_MSB;
   if (raw_attr->bitorderinfield == ORDER_MSB) orders = !orders;
   coding_par.byteorder = orders ? ORDER_MSB : ORDER_LSB;
-  orders = FALSE;
-  if (raw_attr->bitorderinoctet == ORDER_MSB) orders = TRUE;
+  orders = raw_attr->bitorderinoctet == ORDER_MSB;
   if (raw_attr->bitorderinfield == ORDER_MSB) orders = !orders;
   coding_par.bitorder = orders ? ORDER_MSB : ORDER_LSB;
   coding_par.hexorder = raw_attr->hexorder;