Index: modules/struct/queue.tcl
==================================================================
--- modules/struct/queue.tcl
+++ modules/struct/queue.tcl
@@ -40,13 +40,12 @@
 	    set r [llength [info commands ::struct::queue_critcl]]
 	}
 	tcl {
 	    variable selfdir
 	    if {
-		[package vsatisfies [package provide Tcl] 8.5] &&
-		(![catch {package require TclOO 0.6.1}] ||
-		 ![catch {package require TclOO 1}])
+		 [package vsatisfies [package provide Tcl] 8.5] &&
+		![catch {package require TclOO 0.6.1 1}]
 	    } {
 		source [file join $selfdir queue_oo.tcl]
 	    } else {
 		source [file join $selfdir queue_tcl.tcl]
 	    }

Index: modules/struct/queue_oo.tcl
==================================================================
--- modules/struct/queue_oo.tcl
+++ modules/struct/queue_oo.tcl
@@ -8,13 +8,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
 # RCS: @(#) $Id: queue_oo.tcl,v 1.2 2010/09/10 17:31:04 andreas_kupries Exp $
 
-if {[catch {package require TclOO 0.6.1}]} {
-    package require TclOO 1
-}
+package require TclOO 0.6.1 1
 
 # Cleanup first
 catch {namespace delete ::struct::queue::queue_oo}
 catch {rename           ::struct::queue::queue_oo {}}
 oo::class create ::struct::queue::queue_oo {

Index: modules/struct/stack.tcl
==================================================================
--- modules/struct/stack.tcl
+++ modules/struct/stack.tcl
@@ -40,13 +40,12 @@
 	    set r [llength [info commands ::struct::stack_critcl]]
 	}
 	tcl {
 	    variable selfdir
 	    if {
-		[package vsatisfies [package provide Tcl] 8.5] &&
-		(![catch {package require TclOO 0.6.1}] ||
-		 ![catch {package require TclOO 1}])
+		 [package vsatisfies [package provide Tcl] 8.5] &&
+		![catch {package require TclOO 0.6.1 1}]
 	    } {
 		source [file join $selfdir stack_oo.tcl]
 	    } else {
 		source [file join $selfdir stack_tcl.tcl]
 	    }

Index: modules/struct/stack_oo.tcl
==================================================================
--- modules/struct/stack_oo.tcl
+++ modules/struct/stack_oo.tcl
@@ -7,13 +7,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
 # RCS: @(#) $Id: stack_oo.tcl,v 1.4 2010/09/10 17:31:04 andreas_kupries Exp $
 
-if {[catch {package require TclOO 0.6.1}]} {
-    package require TclOO 1
-}
+package require TclOO 0.6.1 1
 
 # Cleanup first
 catch {namespace delete ::struct::stack::stack_oo}
 catch {rename           ::struct::stack::stack_oo {}}
 

