Index: openacs-4/packages/acs-core-docs/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/index.vuh,v
diff -u -r1.2 -r1.2.26.1
--- openacs-4/packages/acs-core-docs/www/index.vuh	24 Sep 2002 00:14:42 -0000	1.2
+++ openacs-4/packages/acs-core-docs/www/index.vuh	8 Sep 2013 08:11:57 -0000	1.2.26.1
@@ -8,7 +8,7 @@
 set path_tail \
   "doc[string range [ad_conn path_info] [string length $package_key] end]"
 
-if {![string compare [ad_conn path_info] "index.html"]} {
+if {[ad_conn path_info] eq "index.html" } {
     rp_internal_redirect "/packages/acs-core-docs/www/index.adp"
 } elseif {[file isdirectory "[acs_root_dir]/packages/$package_key/www/doc"]} {
   rp_internal_redirect "/packages/$package_key/www/$path_tail"
Index: openacs-4/packages/ajaxhelper/www/doc/default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/doc/default-master.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/ajaxhelper/www/doc/default-master.tcl	8 Sep 2007 14:21:22 -0000	1.1
+++ openacs-4/packages/ajaxhelper/www/doc/default-master.tcl	8 Sep 2013 08:11:58 -0000	1.1.2.1
@@ -11,7 +11,7 @@
 #
 set system_name [ad_system_name]
 
-if { [string equal [ad_conn url] "/"] } {
+if {[ad_conn url] eq "/"} {
     set system_url ""
 } else {
     set system_url [ad_url]
@@ -114,7 +114,7 @@
 set acs_lang_url [apm_package_url_from_key "acs-lang"]
 set num_of_locales [llength [lang::system::get_locales]]
 
-if {[empty_string_p $acs_lang_url]} {
+if {$acs_lang_url eq ""} {
     set lang_admin_p 0
 } else {
     set lang_admin_p [permission::permission_p \
Index: openacs-4/packages/attachments/www/download/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/download/index.vuh,v
diff -u -r1.1 -r1.1.22.1
--- openacs-4/packages/attachments/www/download/index.vuh	2 Jul 2002 19:41:20 -0000	1.1
+++ openacs-4/packages/attachments/www/download/index.vuh	8 Sep 2013 08:11:58 -0000	1.1.22.1
@@ -19,7 +19,7 @@
 # (and check that this is the right attachment while we're at it)
 set version_id [db_string select_version_id {} -default {}]
 
-if {[empty_string_p $version_id]} {
+if {$version_id eq ""} {
     ad_return_complaint "bad attachment"
     ad_script_abort
     return
Index: openacs-4/packages/categories/www/cadmin/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/master.tcl,v
diff -u -r1.10 -r1.10.4.1
--- openacs-4/packages/categories/www/cadmin/master.tcl	21 Dec 2008 18:05:35 -0000	1.10
+++ openacs-4/packages/categories/www/cadmin/master.tcl	8 Sep 2013 08:11:58 -0000	1.10.4.1
@@ -6,7 +6,7 @@
     set change_locale t
 }
 
-if {![exists_and_not_null locale]} {
+if {(![info exists locale] || $locale eq "")} {
     #set locale [parameter::get -parameter DefaultLocale -default en_US]
     set locale [ad_conn locale]
 }
Index: openacs-4/packages/file-storage/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.vuh,v
diff -u -r1.4.6.1 -r1.4.6.2
--- openacs-4/packages/file-storage/www/index.vuh	6 Sep 2013 16:54:47 -0000	1.4.6.1
+++ openacs-4/packages/file-storage/www/index.vuh	8 Sep 2013 08:11:58 -0000	1.4.6.2
@@ -11,7 +11,7 @@
 set root_folder [fs_get_root_folder]
 set file_item_id [fs::get_item_id -name $extra_uri -folder_id $root_folder]
 ns_log debug "File Storage index.vuh item_id=$file_item_id URL=[ad_conn url]"
-if {[empty_string_p $file_item_id]} {
+if {$file_item_id eq ""} {
 	ns_log debug "File Storage return not found"
 	ns_return 404 text/plain "File Not Found"
 	ad_script_abort
Index: openacs-4/packages/file-storage/www/download/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download/index.vuh,v
diff -u -r1.10.4.1 -r1.10.4.2
--- openacs-4/packages/file-storage/www/download/index.vuh	6 Sep 2013 16:54:48 -0000	1.10.4.1
+++ openacs-4/packages/file-storage/www/download/index.vuh	8 Sep 2013 08:11:58 -0000	1.10.4.2
@@ -19,10 +19,10 @@
     }
 }
 
-if {![exists_and_not_null version_id] && [info exists file_id]} {
+if {(![info exists version_id] || $version_id eq "") && [info exists file_id]} {
     set version_id [content::item::get_live_revision -item_id $file_id]
 }
-if { ![exists_and_not_null file_id] && [info exists version_id] } {
+if { (![info exists file_id] || $file_id eq "") && [info exists version_id] } {
     set file_id [content::revision::item_id -revision_id $version_id]
 }
 
Index: openacs-4/packages/file-storage/www/download-archive/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download-archive/index.vuh,v
diff -u -r1.5 -r1.5.8.1
--- openacs-4/packages/file-storage/www/download-archive/index.vuh	26 May 2005 08:28:46 -0000	1.5
+++ openacs-4/packages/file-storage/www/download-archive/index.vuh	8 Sep 2013 08:11:58 -0000	1.5.8.1
@@ -10,10 +10,10 @@
     {object_id:integer,optional}
 }
 
-if {[exists_and_not_null object_id]} {
+if {([info exists object_id] && $object_id ne "")} {
     set download_name [fs::get_file_system_safe_object_name -object_id $object_id]
     set ext [fs::get_archive_extension]
-    if {![empty_string_p $ext]} {
+    if {$ext ne ""} {
         append download_name ".${ext}"
     }
 
Index: openacs-4/packages/file-storage/www/rss/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/rss/index.vuh,v
diff -u -r1.2 -r1.2.12.1
--- openacs-4/packages/file-storage/www/rss/index.vuh	13 Jan 2005 13:58:13 -0000	1.2
+++ openacs-4/packages/file-storage/www/rss/index.vuh	8 Sep 2013 08:11:58 -0000	1.2.12.1
@@ -15,7 +15,7 @@
 
 set stub [lindex $path_info 1]
 
-if { ![string equal $stub rss.xml] } {
+if { $stub ne "rss.xml" } {
 	ns_returnnotfound
 	ad_script_abort 
 }
Index: openacs-4/packages/file-storage/www/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/view/index.vuh,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/file-storage/www/view/index.vuh	6 Sep 2013 16:54:48 -0000	1.8.2.1
+++ openacs-4/packages/file-storage/www/view/index.vuh	8 Sep 2013 08:11:58 -0000	1.8.2.2
@@ -34,7 +34,7 @@
 if {[parameter::get -parameter BehaveLikeFilesystemP -default 0] || [catch {set init_p [content::init the_url the_root $content_root $template_root public $revision_id $content_type]}] || !$init_p } {
     
     # Make sure we are not dealing with an upgraded file and there exists a file with the title
-    if { [string equal "" $file_id] } {
+    if {$file_id eq ""} {
         set splitted_url [split $the_url "/"]
         set item_url_title [lindex $splitted_url end]
 
@@ -59,7 +59,7 @@
             set file_id [content::symlink::resolve -item_id $file_id]
         }           
 
-        if {![exists_and_not_null version_id]} {
+        if {(![info exists version_id] || $version_id eq "")} {
             set version_id [content::item::get_live_revision -item_id $file_id]
         }