Index: openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl,v
diff -u -r1.42.8.1 -r1.42.8.2
--- openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl	30 Sep 2013 18:26:48 -0000	1.42.8.1
+++ openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl	2 Oct 2013 08:29:06 -0000	1.42.8.2
@@ -681,7 +681,7 @@
             aa_false "Param UseEmailForLoginP 0 -> false" [auth::UseEmailForLoginP]
 
             array set elms [auth::get_registration_elements]
-            aa_false "Registration elements do contain username" [expr [lsearch [concat $elms(required) $elms(optional)] "username"] == -1]
+            aa_false "Registration elements do contain username" [expr {"username" ni [concat $elms(required) $elms(optional)]}]
 
             parameter::set_value -parameter UseEmailForLoginP -package_id [ad_acs_kernel_id] -value {}
             aa_true "Param UseEmailForLoginP {} -> true" [auth::UseEmailForLoginP]
@@ -696,7 +696,7 @@
 
             # GetElements
             array set elms [auth::get_registration_elements]
-            aa_true "Registration elements do NOT contain username" [expr {[lsearch [concat $elms(required) $elms(optional)] "username"] == -1}]
+            aa_true "Registration elements do NOT contain username" [expr {"username" ni [concat $elms(required) $elms(optional)]}]
             
             # Create a user with no username
             set email [string tolower "[ad_generate_random_string]@foobar.com"]
Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -r1.24.2.1 -r1.24.2.2
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	28 Sep 2013 14:09:55 -0000	1.24.2.1
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	2 Oct 2013 08:29:06 -0000	1.24.2.2
@@ -45,7 +45,7 @@
 } {
     array set mandatory_params_array [install_mandatory_params]
     set mandatory_names [array names mandatory_params_array]
-    return [expr {[lsearch -exact $mandatory_names $param_name] != -1}]
+    return [expr {$param_name in $mandatory_names}]
 }
 
 ad_proc -private install_mandatory_params {} {
@@ -115,7 +115,7 @@
                                  [array names optional_params_array]]
         foreach param_name $all_param_names {
             set param_value [ns_set iget $form $param_name]
-            set mandatory_p [expr {[lsearch -exact $mandatory_params $param_name] != -1}]
+            set mandatory_p [expr {$param_name in $mandatory_params}]
 
             if { $param_value ne "" } {
                 # Param in form - set value in callers scope
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.3 -r1.41.2.4
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	1 Oct 2013 07:40:20 -0000	1.41.2.3
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	2 Oct 2013 08:29:06 -0000	1.41.2.4
@@ -216,7 +216,7 @@
         set file_type [apm_guess_file_type $package_key $rel_path]
         set file_db_type [apm_guess_db_type $package_key $rel_path]
 
-        set type_match_p [expr {$file_types eq "" || [lsearch $file_types $file_type] != -1}]
+        set type_match_p [expr {$file_types eq "" || $file_type in $file_types}]
 
         if { $all_db_types_p } {
             set db_match_p 1