--- a/DeviceWorkstation.st	Sat Jul 13 22:37:58 2013 +0200
+++ b/DeviceWorkstation.st	Sat Jul 13 22:38:32 2013 +0200
@@ -5811,10 +5811,8 @@
 
 removeModalWindowListener:aListener
     aboutToOpenModalWindowHooks notNil ifTrue:[
-	aboutToOpenModalWindowHooks remove:aListener ifAbsent:[].
-	aboutToOpenModalWindowHooks isEmpty ifTrue:[
-	    aboutToOpenModalWindowHooks := nil
-	].
+        aboutToOpenModalWindowHooks remove:aListener ifAbsent:[].
+        aboutToOpenModalWindowHooks := aboutToOpenModalWindowHooks asNilIfEmpty.
     ]
 
     "Created: / 24-10-2010 / 14:58:02 / cg"
@@ -5822,10 +5820,8 @@
 
 removeNonModalWindowListener:aListener
     aboutToOpenNonModalWindowHooks notNil ifTrue:[
-	aboutToOpenNonModalWindowHooks remove:aListener ifAbsent:[].
-	aboutToOpenNonModalWindowHooks isEmpty ifTrue:[
-	    aboutToOpenNonModalWindowHooks := nil
-	].
+        aboutToOpenNonModalWindowHooks remove:aListener ifAbsent:[].
+        aboutToOpenNonModalWindowHooks := aboutToOpenNonModalWindowHooks asNilIfEmpty.
     ]
 
     "Created: / 24-10-2010 / 14:58:19 / cg"
@@ -8252,11 +8248,11 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.586 2013-06-25 21:37:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.587 2013-07-13 20:38:32 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.586 2013-06-25 21:37:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.587 2013-07-13 20:38:32 cg Exp $'
 ! !