--- a/ObjectFileHandle.st	Tue Oct 10 23:28:29 2006 +0200
+++ b/ObjectFileHandle.st	Thu Oct 12 20:15:21 2006 +0200
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libcomp' }"
 
 Object subclass:#ObjectFileHandle
@@ -440,24 +439,30 @@
 package
     "retrieve the packageID of the class-library handle"
 
-    |cls mthd|
+    |classes methods|
 
     "/ sigh - for now, the package must be extracted from the first classes/methods
     "/ package.
 
     self isClassLibHandle ifTrue:[
-        cls := self classes firstIfEmpty:nil.
-        cls notNil ifTrue:[^ cls package]
+        (classes := self classes) notEmpty ifTrue:[
+            ^ classes first package
+        ].
+        ^ nil
     ].
     self isMethodHandle ifTrue:[
-        cls := self methods firstIfEmpty:nil.
-        mthd notNil ifTrue:[^ mthd package]
+        (methods := self methods) notEmpty ifTrue:[
+            ^ methods first package
+        ].
+        ^ nil
     ].
     ^ nil
+
+    "Modified: / 12-10-2006 / 20:00:15 / cg"
 ! !
 
 !ObjectFileHandle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileHandle.st,v 1.35 2006-06-22 16:14:23 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileHandle.st,v 1.36 2006-10-12 18:15:21 cg Exp $'
 ! !