Index: openacs-4/packages/acs-ldap-authentication/tcl/ldap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/tcl/ldap-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-ldap-authentication/tcl/ldap-procs.tcl	23 Apr 2018 15:19:31 -0000	1.4
+++ openacs-4/packages/acs-ldap-authentication/tcl/ldap-procs.tcl	22 May 2018 16:44:55 -0000	1.5
@@ -367,13 +367,13 @@
 ad_proc -private ldap_valid_value_p { value } {
     Checks that the value is not an LDAP error string
 } {
-    return [expr [string first "__LDAP_ERROR" $value] != 0]
+    return [expr {[string first "__LDAP_ERROR" $value] != 0}]
 }
 
 ad_proc -private ldap_valid_and_not_empty_p { value } {
     Checks that the value is not empty or an LDAP error string
 } {
-    return [expr ![empty_string_p $value] && [ldap_valid_value_p $value]]
+    return [expr {$value ne "" && [ldap_valid_value_p $value]}]
 }
 
 ad_proc -private ldap_make_dn { object_id } {
Index: openacs-4/packages/acs-templating/www/doc/gen/generate-docs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/generate-docs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/gen/generate-docs.tcl	7 Aug 2017 23:48:03 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/gen/generate-docs.tcl	22 May 2018 16:44:55 -0000	1.4
@@ -28,7 +28,7 @@
 # uses ns_library to find the server root, may not always be accurate
 proc ::template::util::server_root {} {
 
-  set path_length [expr [llength [file split [ns_library private]]] - 1]
+  set path_length [expr {[llength [file split [ns_library private]]] - 1}]
   set svr_root "/[join [lreplace [file split [ns_library private]] $path_length $path_length] / ]"
   return $svr_root 
 }
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl,v
diff -u -N -r1.59 -r1.60
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	16 May 2018 22:04:59 -0000	1.59
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	22 May 2018 16:44:55 -0000	1.60
@@ -1543,7 +1543,7 @@
     Is the user bugs only feature turned on?
     Admins always see all bugs.
 } {
-    return [expr [string equal [lindex [bug_tracker::access_policy] 1] "user_bugs"]]
+    return [expr {[lindex [bug_tracker::access_policy] 1] eq "user_bugs"}]
 }
 
 ad_proc -private bug_tracker::set_access_policy {
Index: openacs-4/packages/calendar/www/mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/calendar/www/mini-calendar.tcl	7 Aug 2017 23:48:05 -0000	1.22
+++ openacs-4/packages/calendar/www/mini-calendar.tcl	22 May 2018 16:44:55 -0000	1.23
@@ -85,7 +85,7 @@
 set day              [util::trim_leading_zeros [lindex $date_list 2]]
 
 set months_list      [dt_month_names]
-set curr_month_idx   [expr [util::trim_leading_zeros [clock format $now -format "%m"]]-1]
+set curr_month_idx   [expr {[util::trim_leading_zeros [clock format $now -format "%m"]]-1}]
 set curr_day         [clock format $now -format "%d"]
 set curr_month       [clock format $now -format "%B"]
 set curr_year        [clock format $now -format "%Y"]
Index: openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl	30 Apr 2018 12:45:00 -0000	1.4
+++ openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl	22 May 2018 16:44:55 -0000	1.5
@@ -48,7 +48,7 @@
         # Get Start and End date Week
         set date [template::util::date::today]
         set year [template::util::date::get_property year $date]
-        set number_week [expr [clock format [clock scan now] -format %W]-1]
+        set number_week [expr {[clock format [clock scan now] -format %W]-1}]
 
         set start_end_date_week [calendar_portlet::twt::get_start_end_week_date $number_week $year]