Index: vhTest/Fake/TECH/PubSub/impl/EventDispatcher.cls.xml
===================================================================
diff -u -r3023 -r3026
--- vhTest/Fake/TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 3023)
+++ vhTest/Fake/TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 3026)
@@ -35,6 +35,16 @@
 <FormalSpec>Subscription:TECH.PubSub.EventSubscription,Event:TECH.PubSub.Event,DispatchType:TECH.PubSub.impl.DispatchType</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Quit:..MagEventUitvoeren(Subscription) ##super(Subscription, Event, DispatchType)
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="MagEventUitvoeren">
+<FormalSpec>Subscription:TECH.PubSub.EventSubscription</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
 	#dim ExecuteEvent As %Boolean = $$$True
 	#dim RemovedSubscriptionsIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(..RemovedSubscriptions)
 	While RemovedSubscriptionsIterator.HasNext() {
@@ -45,8 +55,7 @@
 			Set ExecuteEvent = $$$False
 		}
 	}
-	Quit:ExecuteEvent ##super(Subscription, Event, DispatchType)
-	Quit $$$OK
+	Quit ExecuteEvent
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml
===================================================================
diff -u -r3023 -r3026
--- vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 3023)
+++ vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 3026)
@@ -19,7 +19,6 @@
 </Method>
 
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>