Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v
diff -u -r1.22.4.3 -r1.22.4.4
--- openacs-4/packages/acs-admin/www/apm/packages-install.tcl	1 Oct 2013 08:47:20 -0000	1.22.4.3
+++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl	2 Oct 2013 07:46:31 -0000	1.22.4.4
@@ -33,7 +33,7 @@
 set all_spec_files $workspace_spec_files
 foreach spec_path $packages_spec_files {
     set spec_filename [file tail $spec_path]
-    if { [lsearch -exact $workspace_filenames $spec_filename] == -1 } {
+    if {$spec_filename ni $workspace_filenames} {
         lappend all_spec_files $spec_path
     }
 }
Index: openacs-4/packages/acs-admin/www/auth/authority.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority.tcl,v
diff -u -r1.21.10.1 -r1.21.10.2
--- openacs-4/packages/acs-admin/www/auth/authority.tcl	27 Aug 2013 11:44:43 -0000	1.21.10.1
+++ openacs-4/packages/acs-admin/www/auth/authority.tcl	2 Oct 2013 07:46:31 -0000	1.21.10.2
@@ -137,7 +137,7 @@
     foreach element $form_widgets_full {
         regexp {^[a-zA-Z_]+} [lindex $element 0] element_name
 
-        if { [lsearch -exact $local_editable_elements $element_name] != -1 } {
+        if {$element_name in $local_editable_elements} {
             lappend form_widgets $element
         }
     }
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.94.2.5 -r1.94.2.6
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	28 Sep 2013 12:10:01 -0000	1.94.2.5
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	2 Oct 2013 07:44:14 -0000	1.94.2.6
@@ -178,7 +178,7 @@
 
     # Make sure old versions work ...
     catch { nsv_set apm_subsite_packages_list package_keys [db_list get_subsites {}] }
-    if { [lsearch -exact [nsv_get apm_subsite_packages_list package_keys] acs-subsite] == -1 } {
+    if {"acs-subsite" ni [nsv_get apm_subsite_packages_list package_keys]} {
         nsv_lappend apm_subsite_packages_list package_keys acs-subsite
     }
 
@@ -601,7 +601,7 @@
     set packages_to_load [list]
     foreach package_key $packages {
         foreach package_to_load [apm_package_load_libraries_order $package_key] {
-            if { [lsearch -exact $packages_to_load $package_to_load] == -1 } {
+            if {$package_to_load ni $packages_to_load} {
                 lappend packages_to_load $package_to_load
             }
         }
@@ -1503,7 +1503,7 @@
 
     set unused_types [list]
     foreach supported_type $supported_types {
-        if { [lsearch -exact $used_callback_types $supported_type] < 0 } {
+        if {$supported_type ni $used_callback_types} {
             lappend unused_types $supported_type
         }
     }
@@ -1610,7 +1610,7 @@
     set arg_string ""
     set provided_arg_names [array names args_array]
     foreach required_arg_name [apm_arg_names_for_callback_type -type $type] {
-        if { [lsearch -exact $provided_arg_names $required_arg_name] < 0 } {
+        if {$required_arg_name ni $provided_arg_names} {
             error "required argument $required_arg_name not supplied to callback proc of type $type"
         }
 
Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl,v
diff -u -r1.30 -r1.30.4.1
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	17 Oct 2010 21:06:09 -0000	1.30
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	2 Oct 2013 07:44:14 -0000	1.30.4.1
@@ -354,7 +354,7 @@
                 continue
             }
             
-            if { [lsearch -exact [apm_supported_callback_types] $type] < 0 } {
+            if {$type ni [apm_supported_callback_types]} {
                 # The callback type is not supported
                 ns_log Error "package info file $path contains an unsupported callback type $type - ignoring. Valid values are [apm_supported_callback_types]"
                 continue
Index: openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl,v
diff -u -r1.12 -r1.12.4.1
--- openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl	8 Apr 2011 10:36:34 -0000	1.12
+++ openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl	2 Oct 2013 07:44:14 -0000	1.12.4.1
@@ -103,7 +103,7 @@
     @param relation_tag Relationship identifier
 } {
     set linked_objects [ application_data_link::get -object_id $object_id -relation_tag $relation_tag]
-    if { [lsearch -exact $linked_objects "$target_object_id"] != -1 } {
+    if {$target_object_id in $linked_objects} {
       # found link
       return 1
     } else {
Index: openacs-4/packages/acs-tcl/tcl/set-operation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/set-operation-procs.tcl,v
diff -u -r1.3 -r1.3.8.1
--- openacs-4/packages/acs-tcl/tcl/set-operation-procs.tcl	12 Feb 2009 15:38:41 -0000	1.3
+++ openacs-4/packages/acs-tcl/tcl/set-operation-procs.tcl	2 Oct 2013 07:44:14 -0000	1.3.8.1
@@ -16,7 +16,7 @@
 ad_proc set_member? { s v } {
     <p>Tests whether or not $v is a member of set $s.</p>
 } {
-    if { [lsearch -exact $s $v] == -1 } {
+    if {$v ni $s} {
 	return 0
     } else {
 	return 1