--- _smtp.tcl	Thu Apr  4 17:24:35 2002
+++ smtp.tcl	Mon Apr 22 21:57:02 2002
@@ -10,25 +10,6 @@
 package require mime 1.0
 package provide smtp 1.3
 
-if {[catch {package require Trf  2.0}]} {
-    # Trf is not available, but we can live without it as long as the
-    # unstack and transform procs are defined.
-
-    # Create these commands in the smtp namespace so that they
-    # won't collide with things at the global namespace level
-
-    namespace eval smtp {
-        proc transform {args} {
- 	    upvar state mystate
-	    set mystate(size) 1
-        }
-        proc unstack {channel} {
-            # do nothing
-            return
-        }
-    }
-}
-
 #
 # state variables:
 #
@@ -55,7 +36,7 @@
 
 if {[catch {package require Trf  2.0}]} {
     # Trf is not available, but we can live without it as long as the
-    # transform proc is defined.
+    # transform and unstack procs are defined.
 
     # Warning!
     # This is a fragile emulation of the more general calling sequence
@@ -64,6 +45,10 @@
     proc transform {args} {
 	upvar state mystate
 	set mystate(size) 1
+    }
+    proc unstack {channel} {
+        # do nothing
+        return
     }
     set ::smtp::trf 0
 }
