Index: openacs-4/packages/acs-templating/tcl/list-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-templating/tcl/list-procs-postgresql.xql	13 Jan 2005 13:56:00 -0000	1.2
+++ openacs-4/packages/acs-templating/tcl/list-procs-postgresql.xql	27 Apr 2018 15:21:39 -0000	1.3
@@ -4,8 +4,8 @@
 
   <fullquery name="template::list::prepare.pagination_query">
     <querytext>
-       $list_properties(page_query_substed) offset [expr $first_row - 1]
-       limit [expr $last_row - $first_row + 1]
+       $list_properties(page_query_substed) offset [expr {$first_row - 1}]
+       limit [expr {$last_row - $first_row + 1}]
     </querytext>
   </fullquery>
 
Index: openacs-4/packages/static-pages/tcl/static-pages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-procs.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/static-pages/tcl/static-pages-procs.tcl	19 Apr 2018 08:00:46 -0000	1.22
+++ openacs-4/packages/static-pages/tcl/static-pages-procs.tcl	27 Apr 2018 15:21:39 -0000	1.23
@@ -266,7 +266,7 @@
 
     if { ! $run_p } {
         # Another copy is running, must abort:
-        set time_diff [expr [ns_time] -  $other_start_time]
+        set time_diff [expr {[ns_time] -  $other_start_time}]
 
         set other_time_pretty [ns_httptime $other_start_time]
         # Could also use: [clock format [clock seconds]]
@@ -309,7 +309,7 @@
             # Chop the starting path off of the full pathname and split it up:
             set path [split [string range $file $fs_trimmed_length end] "/"]
             # Throw away the first entry (empty) and the last entry (which is the filename):
-            set path [lrange $path 1 [expr [llength $path]-2]]
+            set path [lrange $path 1 [expr {[llength $path]-2}]]
 
             set cumulative_path ""
             set parent_folder_id $root_folder_id
@@ -802,7 +802,7 @@
             #
             set body_close [string first "</body" [string tolower $file_contents]]
             if { $body_close >= 0 } {
-                set body "[string range $file_contents 0 [expr $body_close-1]]${comment_link}[string range $file_contents $body_close end]"
+                set body "[string range $file_contents 0 [expr {$body_close-1}]]${comment_link}[string range $file_contents $body_close end]"
             } else {
                 set body "${file_contents}$comment_link"
             }