Index: openacs-4/packages/acs-bootstrap-installer/installer/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/index.tcl,v
diff -u -r1.30.2.3 -r1.30.2.4
--- openacs-4/packages/acs-bootstrap-installer/installer/index.tcl	10 Sep 2015 08:21:15 -0000	1.30.2.3
+++ openacs-4/packages/acs-bootstrap-installer/installer/index.tcl	28 Oct 2016 20:31:56 -0000	1.30.2.4
@@ -177,8 +177,9 @@
 
 set stacksize [ns_config "ns/threads" StackSize]
 
-if { ![string is integer $stacksize] ||
-     $stacksize < [expr {$acs_application(min_stack_size) * 1024}] } {
+if { ![string is integer $stacksize]
+     || $stacksize < $acs_application(min_stack_size) * 1024
+ } {
     append errors "<li><p><strong>The configured AOLserver Stacksize is too small, missing, or a non-integer value.
 $acs_application(pretty_name) requires a StackSize parameter of at least
 ${acs_application(min_stack_size)}K.
Index: openacs-4/packages/acs-lang/www/admin/batch-editor.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.tcl,v
diff -u -r1.10.2.2 -r1.10.2.3
--- openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	18 Sep 2015 07:41:03 -0000	1.10.2.2
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	28 Oct 2016 20:31:56 -0000	1.10.2.3
@@ -129,7 +129,9 @@
 
 lappend edit_buttons { "Update" "ok" }
 
-if { $show ne "untranslated" && $page_end < [expr {$total}] } { 
+if { $show ne "untranslated"
+     && $page_end < $total
+ } {
     lappend edit_buttons { "Update and next >" "next" }
 }
 
@@ -255,7 +257,7 @@
 
 for {set count 0} {$count < $total} {incr count 10 } {
     set end_page [expr {$count + 9}]
-    if { $end_page > [expr {$total-1}] } {
+    if { $end_page > $total-1 } {
         set end_page [expr {$total-1}]
     }
     
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.39.2.11 -r1.39.2.12
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	27 Oct 2015 10:03:08 -0000	1.39.2.11
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	28 Oct 2016 20:31:56 -0000	1.39.2.12
@@ -201,7 +201,7 @@
   for { set $i [expr {1 + $startrow}] } { \$$i <= \${$name:rowcount}"
 
   if {$maxrows >= 0} {
-    template::adp_append_code " && \$$i <= [expr {$maxrows + $startrow}]" \
+    template::adp_append_code " && \$$i <= $maxrows + $startrow" \
 	-nobreak
   }
   
@@ -214,7 +214,7 @@
       template::adp_append_code " if { \$$i < \${$name:rowcount}"
 
       if {$maxrows >= 0} {
-	  template::adp_append_code " && \$$i < [expr {$maxrows + $startrow}]" \
+	  template::adp_append_code " && \$$i < $maxrows + $startrow" \
 	      -nobreak
       }
 
Index: openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl	10 Sep 2015 08:22:16 -0000	1.5.2.1
+++ openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl	28 Oct 2016 20:31:56 -0000	1.5.2.2
@@ -117,7 +117,7 @@
 
 set rowcount [set address:rowcount]
 
-if { $rowcount > [expr {$start_row + $num_rows}] } {
+if { $rowcount > $start_row + $num_rows } {
     set next_set [expr {$start_row + $num_rows}]
 } else {
     set next_set ""
@@ -133,7 +133,7 @@
     set previous_set 1 
 }
 
-if {$rowcount > [expr {$next_set + $num_rows}]} {
+if {$rowcount > $next_set + $num_rows} {
     set last_set [expr {$rowcount - ($rowcount % $num_rows)}]
 } else {
     set last_set ""
Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v
diff -u -r1.41.2.1 -r1.41.2.2
--- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	12 Sep 2015 11:06:02 -0000	1.41.2.1
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	28 Oct 2016 20:31:56 -0000	1.41.2.2
@@ -327,7 +327,7 @@
     set interval_def [template::util::date::defaultInterval day]
     for { set i [lindex $interval_def 0] }  { $i <= 15 }  { incr i 1 } {
 	incr day
-	if { [expr {$day + $i}] >= [lindex $interval_def 1] } {
+	if { $day + $i >= [lindex $interval_def 1] } {
 	    incr month 1
 	    set day 1
 	}
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.193.2.4 -r1.193.2.5
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	11 May 2016 18:15:15 -0000	1.193.2.4
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	28 Oct 2016 20:31:56 -0000	1.193.2.5
@@ -197,7 +197,7 @@
         # ignore the csv list if we have a template
         if {$csv_list ne "" && $template_id eq ""} {
             # if there are more pages in the csv_list, create them
-            for {set i 1} {$i < [expr [llength $page_name_list]]} {incr i} {
+            for {set i 1} {$i < [llength $page_name_list]} {incr i} {
                 portal::page_create -portal_id $portal_id \
                     -pretty_name [lindex $page_name_list $i] \
                     -accesskey [lindex $page_accesskey_list $i] \