Index: openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl,v
diff -u -r1.31.4.1 -r1.31.4.2
--- openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	23 Aug 2013 10:08:48 -0000	1.31.4.1
+++ openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	1 Oct 2013 07:40:20 -0000	1.31.4.2
@@ -148,7 +148,7 @@
     # alphabetically.  This code is obsolete and has been commented out
     # for 5.7.
 
-    #if {[info command ::xotcl::Class] ne "" &&
+    #if {[info commands ::xotcl::Class] ne "" &&
     #    [file isdirectory $root_directory/packages/xotcl-core]} {
     #   apm_bootstrap_load_libraries -procs xotcl-core
     #   apm_bootstrap_load_libraries -init xotcl-core
Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v
diff -u -r1.41.2.4 -r1.41.2.5
--- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl	5 Sep 2013 11:50:59 -0000	1.41.2.4
+++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl	1 Oct 2013 07:40:20 -0000	1.41.2.5
@@ -38,7 +38,7 @@
 
 proc ad_make_relative_path { path } {
     set root_length [string length [acs_root_dir]]
-    if { ![string compare [acs_root_dir] [string range $path 0 $root_length-1]] } {
+    if { [acs_root_dir] eq [string range $path 0 $root_length-1] } {
 	return [string range $path $root_length+1 [string length $path]]
     }
     error "$path is not under the path root ([acs_root_dir])"
@@ -254,7 +254,7 @@
         }
     }
 
-    set arg_list [lindex $args [expr { $i + 1 }]]
+    set arg_list [lindex $args $i+1]
     if { $n_args_remaining == 3 } {
         # No doc string provided.
         array set doc_elements [list]
@@ -307,7 +307,7 @@
     set last_arg [lindex $effective_arg_list end]
     if { [llength $last_arg] == 1 && [string equal [lindex $last_arg 0] "args"] } {
         set varargs_p 1
-        set effective_arg_list [lrange $effective_arg_list 0 [expr { [llength $effective_arg_list] - 2 }]]
+        set effective_arg_list [lrange $effective_arg_list 0 [llength $effective_arg_list]-2]
     }
 
     set check_code ""
@@ -403,7 +403,7 @@
     set root_dir [nsv_get acs_properties root_directory]
     set script [info script]
     set root_length [string length $root_dir]
-    if { ![string compare $root_dir [string range $script 0 $root_length-1]] } {
+    if { $root_dir eq [string range $script 0 $root_length-1] } {
         set script [string range $script $root_length+1 end]
     }
     
@@ -684,7 +684,7 @@
 } {
     if {[lindex $allowed_args end] eq "args"} {
 	set varargs_p 1
-	set allowed_args [lrange $allowed_args 0 [expr { [llength $allowed_args] - 2 }]]
+	set allowed_args [lrange $allowed_args 0 [llength $allowed_args]-2]
     } else {
 	set varargs_p 0
     }
Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v
diff -u -r1.41.2.2 -r1.41.2.3
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	14 Sep 2013 15:03:34 -0000	1.41.2.2
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	1 Oct 2013 07:40:20 -0000	1.41.2.3
@@ -212,7 +212,7 @@
 
     set matching_files [list]
     foreach file $files {
-        set rel_path [string range $file [expr {[string length $package_path] + 1}] end]
+        set rel_path [string range $file [string length $package_path]+1 end]
         set file_type [apm_guess_file_type $package_key $rel_path]
         set file_db_type [apm_guess_db_type $package_key $rel_path]
 
@@ -333,7 +333,7 @@
          "ctl_file" eq $file_type } {
         set sql_index [lsearch $components "sql"]
         if { $sql_index >= 0 } {
-            set db_dir [lindex $components [expr {$sql_index + 1}]]
+            set db_dir [lindex $components $sql_index+1]
             if {$db_dir eq "common"} {
                 return ""
             }
Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v
diff -u -r1.42.2.2 -r1.42.2.3
--- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl	5 Sep 2013 11:50:59 -0000	1.42.2.2
+++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl	1 Oct 2013 07:40:20 -0000	1.42.2.3
@@ -853,13 +853,13 @@
 	append new_file_content [string range $rest_of_file_content 0 [expr {$first_querytext_open + $querytext_open_len - 1}]]
 
 	# append quoted querytext
-	append new_file_content [ns_quotehtml [string range $rest_of_file_content [expr {$first_querytext_open + $querytext_open_len}] [expr {$first_querytext_close - 1}]]]
+	append new_file_content [ns_quotehtml [string range $rest_of_file_content $first_querytext_open+$querytext_open_len $first_querytext_close-1]]
 
 	# append close querytext
 	append new_file_content $querytext_close
 
 	# Set up the rest
-	set rest_of_file_content [string range $rest_of_file_content [expr {$first_querytext_close + $querytext_close_len}] end]
+	set rest_of_file_content [string range $rest_of_file_content $first_querytext_close+$querytext_close_len end]
     }
 
     # db_qd_log QDDebug "new massaged file content: \n $new_file_content \n"