Index: openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl,v
diff -u -N -r1.93.2.4 -r1.93.2.5
--- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	23 Jul 2019 16:51:49 -0000	1.93.2.4
+++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	23 Jul 2019 17:06:23 -0000	1.93.2.5
@@ -54,7 +54,7 @@
 
 set ::xo::naviserver [expr {[ns_info name] eq "NaviServer"}]
 
-if {[info commands ::nx::Object] ne ""} {
+if {[nsf::is object ::nx::Object]} {
   ns_log notice "Defining minimal XOTcl 1 compatibility"
   ::nsf::method::alias ::xo::Attribute instvar ::nsf::methods::object::instvar
 
@@ -896,7 +896,7 @@
       return [nsf::is object $o]
     }
     "isbaseclass" {
-      if {[info commands $o] eq ""} {return 0}
+      if {![nsf::is class $o]} {return 0}
       if {[catch {set p [$o info precedence]}]} {return 0}
       return [expr {[lindex $p end] eq $o}]
     }
Index: openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl,v
diff -u -N -r1.24.2.1 -r1.24.2.2
--- openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl	8 May 2019 14:22:02 -0000	1.24.2.1
+++ openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl	23 Jul 2019 17:06:23 -0000	1.24.2.2
@@ -269,7 +269,7 @@
       # Try to get the package id; if everything fails, use kernel_id
       # (to be compatible with traditional parameter::get)
       #
-      set package_id [expr {[info commands ::xo::cc] ne "" ? 
+      set package_id [expr {[nsf::is object ::xo::cc] ? 
                             [::xo::cc package_id] : 
                             [ns_conn isconnected] ? [ad_conn package_id] : [ad_acs_kernel_id]}]
     }
Index: openacs-4/packages/xotcl-core/tcl/install-check-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/install-check-procs.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/xotcl-core/tcl/install-check-procs.tcl	7 Aug 2017 23:48:30 -0000	1.6
+++ openacs-4/packages/xotcl-core/tcl/install-check-procs.tcl	23 Jul 2019 17:06:23 -0000	1.6.2.1
@@ -7,7 +7,7 @@
     @author Gustaf Neumann (neumann@wu-wien.ac.at)
   } {
     ns_log notice "-- before-install callback"
-    if {[info commands ::xotcl::Class] eq ""} {
+    if {![nsf::is object ::xotcl::Class]} {
       error " XOTcl does not appear to be installed on your system!\n\
      Please follow the install instructions on http://www.openacs.org/xowiki/xotcl-core"
     } elseif {$::xotcl::version < 1.5} {
Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v
diff -u -N -r1.148.2.12 -r1.148.2.13
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	23 Jul 2019 16:51:49 -0000	1.148.2.12
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	23 Jul 2019 17:07:06 -0000	1.148.2.13
@@ -2216,7 +2216,7 @@
         $ip_var ip
 
     if {![info exists package_id]} {
-      if {[info commands ::xo::cc] ne ""} {
+      if {[nsf::is object ::xo::cc]} {
         set package_id    [::xo::cc package_id]
       } elseif {[ns_conn isconnected]} {
         set package_id    [ad_conn package_id]
@@ -2225,7 +2225,7 @@
       }
     }
     if {![info exists user_id]} {
-      if {[info commands ::xo::cc] ne ""} {
+      if {[nsf::is object ::xo::cc]} {
         set user_id    [::xo::cc user_id]
       } elseif {[ns_conn isconnected]} {
         set user_id    [ad_conn user_id]
@@ -2370,10 +2370,10 @@
     foreach selection $sets {
       if {$named_objects} {
         set object_name ::[ns_set get $selection $object_named_after]
-        if {[info commands $object_name] eq ""} {
-          set o [$object_class create $object_name]
-        } else {
+        if {[nsf::is object $object_name]} {
           set o $object_name
+        } else {
+          set o [$object_class create $object_name]
         }
       } else {
         set o [$object_class new]