Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.89 -r1.89.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	10 Nov 2007 19:56:56 -0000	1.89
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	22 Mar 2008 18:31:26 -0000	1.89.2.1
@@ -2189,7 +2189,7 @@
     set parameter "package_instance_name"
     set version_id [apm_version_id_from_package_key $package_key]
 
-    if {![empty_string_p $version_id]} {
+    if {$version_id ne ""} {
         apm::package_version::attributes::get -version_id $version_id -array packages_names
 	# it was added this catch for those packages that does not
 	# have the attribute package instance name, in this case
Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl,v
diff -u -r1.55 -r1.55.2.1
--- openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	20 Jan 2008 11:30:41 -0000	1.55
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	22 Mar 2008 18:31:26 -0000	1.55.2.1
@@ -654,7 +654,7 @@
 
     @author Malte Sussdorff (malte.sussdorff@cognovis.de)
 } {
-    if { [empty_string_p $user_id]} {
+    if { $user_id eq ""} {
         set user_id [ad_conn user_id]
     }
 
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.91.2.1 -r1.91.2.2
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	13 Mar 2008 16:41:02 -0000	1.91.2.1
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	22 Mar 2008 18:31:26 -0000	1.91.2.2
@@ -1493,7 +1493,7 @@
     # Other hostnames map to subsites.
     set node_id [util_memoize [list rp_lookup_node_from_host $host]]
 
-    if {[empty_string_p $node_id]} {
+    if {$node_id eq ""} {
         set host [regsub "www\." $host ""]
         set node_id [rp_lookup_node_from_host $host]
     }
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -r1.23 -r1.23.2.1
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	29 Aug 2007 13:53:40 -0000	1.23
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	22 Mar 2008 18:31:26 -0000	1.23.2.1
@@ -1872,7 +1872,7 @@
     }
     # trim leading zeros, so as not to confuse Tcl
     set value [string trimleft $value "0"]
-    if { [empty_string_p $value] } {
+    if { $value eq "" } {
 			# but not all of the zeros
 			set value "0"
     }
Index: openacs-4/packages/acs-tcl/tcl/tdom-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tdom-procs.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-tcl/tcl/tdom-procs.tcl	1 Aug 2007 08:30:53 -0000	1.2
+++ openacs-4/packages/acs-tcl/tcl/tdom-procs.tcl	22 Mar 2008 18:31:26 -0000	1.2.2.1
@@ -45,7 +45,7 @@
     set node_object ""
     foreach node_name $args {
 	catch {set node_object [$parent_node_object getElementsByTagName "$node_name"]}
-	if {![string equal $node_object ""]} {
+	if {$node_object ne "" } {
 	    return $node_object
 	}
     }
@@ -85,7 +85,7 @@
 
     foreach tag_name $args {
 	catch {set tag_value [[$node_object getElementsByTagName "$tag_name"] text]} errormsg
-	if {![string equal [string trim $tag_value] ""]} {
+	if {[string trim $tag_value] ne "" } {
 	    return $tag_value
 	}
     }
Index: openacs-4/packages/acs-tcl/tcl/test/html-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/html-email-procs.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/acs-tcl/tcl/test/html-email-procs.tcl	6 Oct 2006 14:45:21 -0000	1.1
+++ openacs-4/packages/acs-tcl/tcl/test/html-email-procs.tcl	22 Mar 2008 18:31:26 -0000	1.1.4.1
@@ -9,7 +9,7 @@
 	[catch {build_mime_message \
 		    "Test Mesage" \
 		    "<p>Test Message</p>"} errmsg]
-
+    aa_log err=$errmsg
     aa_false "Package require mime package found" \
 	[catch {package require mime} errmsg]