Index: TECH/DynamicIterator.cls.xml
===================================================================
diff -u -r2604 -r2605
--- TECH/DynamicIterator.cls.xml	(.../DynamicIterator.cls.xml)	(revision 2604)
+++ TECH/DynamicIterator.cls.xml	(.../DynamicIterator.cls.xml)	(revision 2605)
@@ -48,18 +48,32 @@
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
 	do:$$$Not(..Found) ..ThrowNextFailedException()
-	#dim NextItem = ..NextItem
+	#dim Value As %CacheString = ..Execute(..NextItem)
 	set ..NextItem = ""
 	do ..GetNextItem()
-	quit ..Execute(NextItem)
+	quit Value
 ]]></Implementation>
 </Method>
 
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..Found
+]]></Implementation>
+</Method>
+
+<Method name="Key">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[
+	#dim Key As %CacheString = ..Iterator.Key()
+	quit Key
+]]></Implementation>
+</Method>
+
 <Method name="GetNextItem">
 <Private>1</Private>
 <Implementation><![CDATA[
 	set ..Found = 0
-	while (..Iterator.HasNext() ) && ('..Found) {
+	while ('..Found) && (..Iterator.HasNext() ) {
 		#dim IteratorItem As %CacheString = ..Iterator.Next()
 		set ..Found = ..IsValid(IteratorItem)
 	}
@@ -68,7 +82,7 @@
 </Method>
 
 <Method name="Execute">
-<FormalSpec>Item:TECH.String</FormalSpec>
+<FormalSpec>Item:%CacheString</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>%Boolean</ReturnType>
@@ -101,21 +115,8 @@
 ]]></Implementation>
 </Method>
 
-<Method name="HasNext">
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..Found
-]]></Implementation>
-</Method>
-
-<Method name="Key">
-<ReturnType>%CacheString</ReturnType>
-<Implementation><![CDATA[
-	#dim Key As %CacheString = ..Iterator.Key()
-	quit Key
-]]></Implementation>
-</Method>
-
 <Method name="ThrowNextFailedException">
+<Private>1</Private>
 <Implementation><![CDATA[
 	#dim ExceptionMessage As TECH.String = ..%ClassName(1) _ ": Geen volgend item meer, einde van lijst is bereikt."
 	#dim ExceptionCode As TECH.enu.ExceptionCode = ##class(TECH.enu.ExceptionCode).GeneralError()