Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v
diff -u -N -r1.54 -r1.55
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	8 Jan 2018 09:41:05 -0000	1.54
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	7 Apr 2018 19:48:03 -0000	1.55
@@ -359,7 +359,9 @@
    set message_count "0"
    foreach message_key $message_key_list {
        puts $catalog_file_id "  <msg key=\"[ns_quotehtml $message_key]\">[ns_quotehtml $messages_array($message_key)]</msg>"
-       if { ([info exists descriptions_array($message_key)] && $descriptions_array($message_key) ne "") && $filename_info(locale) eq "en_US" } {
+       if { [info exists descriptions_array($message_key)] && $descriptions_array($message_key) ne ""
+            && $filename_info(locale) eq "en_US"
+        } {
            puts $catalog_file_id "  <description key=\"[ns_quotehtml $message_key]\">[ns_quotehtml $descriptions_array($message_key)]</description>\n"
        }
        incr message_count
Index: openacs-4/packages/acs-lang/tcl/locale-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/locale-procs.tcl,v
diff -u -N -r1.41 -r1.42
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	1 Mar 2018 11:49:24 -0000	1.41
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	7 Apr 2018 19:48:03 -0000	1.42
@@ -576,7 +576,7 @@
     foreach locale $conn_locales {       
         regexp {^([^_]+)(?:_([^_]+))?$} $locale locale language region 
 
-        if { ([info exists region] && $region ne "") } {
+        if { [info exists region] && $region ne "" } {
             # We have both language and region, e.g. en_US
             if {$locale in $system_locales} {
                 # The locale was found in the system, a perfect match           
@@ -607,9 +607,9 @@
         }
     }
 
-    if { ([info exists perfect_match] && $perfect_match ne "") } {
+    if { [info exists perfect_match] && $perfect_match ne "" } {
         return $perfect_match
-    } elseif { ([info exists tentative_match] && $tentative_match ne "") } {
+    } elseif { [info exists tentative_match] && $tentative_match ne "" } {
         return $tentative_match
     } else {
         # We didn't find a match
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	29 Dec 2017 11:13:40 -0000	1.22
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	7 Apr 2018 19:48:03 -0000	1.23
@@ -117,7 +117,7 @@
         and    cu.user_id = lm.creation_user
     }]
 
-    if { ([info exists message] && $message ne "") } {
+    if { [info exists message] && $message ne "" } {
         set message $message
     } else {
         set message $original_message
Index: openacs-4/packages/acs-lang/www/admin/locale-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-delete.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-lang/www/admin/locale-delete.tcl	7 Aug 2017 23:47:57 -0000	1.8
+++ openacs-4/packages/acs-lang/www/admin/locale-delete.tcl	7 Apr 2018 19:48:03 -0000	1.9
@@ -27,8 +27,9 @@
 set form_export_vars [export_vars -form { locale {confirm_p 1} }]
 
 
-if { ([info exists confirm_p] && $confirm_p ne "") && [template::util::is_true $confirm_p] } {
-
+if { [info exists confirm_p] && $confirm_p ne ""
+     && [template::util::is_true $confirm_p]
+ } {
     db_transaction {
 
         db_dml delete_messages { delete from lang_messages where locale = :locale }
Index: openacs-4/packages/acs-lang/www/admin/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-delete.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-lang/www/admin/message-delete.tcl	7 Aug 2017 23:47:57 -0000	1.9
+++ openacs-4/packages/acs-lang/www/admin/message-delete.tcl	7 Apr 2018 19:48:03 -0000	1.10
@@ -31,7 +31,9 @@
 set form_export_vars [export_vars -form { locale package_key message_key show {confirm_p 1} }]
 
 
-if { ([info exists confirm_p] && $confirm_p ne "") && [template::util::is_true $confirm_p] } {
+if { [info exists confirm_p] && $confirm_p ne ""
+     && [template::util::is_true $confirm_p]
+ } {
     lang::message::delete \
         -package_key $package_key \
         -message_key $message_key \
Index: openacs-4/packages/acs-lang/www/admin/message-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-search.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-lang/www/admin/message-search.tcl	7 Aug 2017 23:47:57 -0000	1.7
+++ openacs-4/packages/acs-lang/www/admin/message-search.tcl	7 Apr 2018 19:48:03 -0000	1.8
@@ -54,7 +54,9 @@
     # locale will be set now
 } 
 
-if { ([info exists search_locale] && $search_locale ne "") && ([info exists q] && $q ne "") } {
+if { [info exists search_locale] && $search_locale ne ""
+     && [info exists q] && $q ne ""
+ } {
     set submit_p 1
 
     set search_string "%$q%"