@@ -34,15 +34,22 @@
 
 #macro (declareEventsIn)
 	int[] eventsInCount = new int[1];
-	Pointer<cl_event> eventsIn = CLAbstractEntity.copyNonNullEntities(eventsToWaitFor, eventsInCount, ptrs.events_in);
+	Pointer<cl_event> eventsIn = 
+		CLAbstractEntity.copyNonNullEntities(eventsToWaitFor, eventsInCount, ptrs.events_in);
 #end
 
 #macro (declareEventOut)
-	Pointer<cl_event> eventOut = CLEvent.new_event_out(eventsToWaitFor, ptrs.event_out);
+	Pointer<cl_event> eventOut = 
+		eventsToWaitFor == null || CLEvent.containsFireAndForget(eventsToWaitFor) 
+		? null 
+		: ptrs.event_out;
 #end
 
 #macro (declareEventsOutBlockable)
-	Pointer<cl_event> eventOut = blocking ? null : CLEvent.new_event_out(eventsToWaitFor, ptrs.event_out);
+	Pointer<cl_event> eventOut = 
+		blocking || eventsToWaitFor == null || CLEvent.containsFireAndForget(eventsToWaitFor) 
+		? null 
+		: ptrs.event_out;
 #end
 
 #macro (declarePErr)
 
@@ -168,16 +168,12 @@ public void run() {
 		}.start();
 	}
 
-    static Pointer<cl_event> new_event_out(CLEvent[] eventsToWaitFor, Pointer<cl_event> event_out) {
-        if (eventsToWaitFor == null)
-        	return null;
-        
-		for (int i = 0, n = eventsToWaitFor.length; i < n; i++) {
+	static boolean containsFireAndForget(CLEvent[] eventsToWaitFor) {
+		for (int i = eventsToWaitFor.length; i-- != 0;) {
 			if (eventsToWaitFor[i] == FIRE_AND_FORGET)
-				return null;
+				return true;
 		}
-		
-        return event_out;
+		return false;
     }
     
 	@Override
 
@@ -7,7 +7,7 @@
  *
  * @author ochafik
  */
-class ReusablePointers {
+final class ReusablePointers {
     public final ReusablePointer
             sizeT3_1 = new ReusablePointer(3 * SizeT.SIZE),
             sizeT3_2 = new ReusablePointer(3 * SizeT.SIZE),
Original file line number	Diff line number	Diff line change
`@@ -168,16 +168,12 @@ public void run() {`
`168`	`168`	`}.start();`
`169`	`169`	`}`
`170`	`170`
`171`		`- static Pointer<cl_event> new_event_out(CLEvent[] eventsToWaitFor, Pointer<cl_event> event_out) {`
`172`		`- if (eventsToWaitFor == null)`
`173`		`- return null;`
`174`		`-`
`175`		`- for (int i = 0, n = eventsToWaitFor.length; i < n; i++) {`
	`171`	`+ static boolean containsFireAndForget(CLEvent[] eventsToWaitFor) {`
	`172`	`+ for (int i = eventsToWaitFor.length; i-- != 0;) {`
`176`	`173`	`if (eventsToWaitFor[i] == FIRE_AND_FORGET)`
`177`		`- return null;`
	`174`	`+ return true;`
`178`	`175`	`}`
`179`		`-`
`180`		`- return event_out;`
	`176`	`+ return false;`
`181`	`177`	`}`
`182`	`178`
`183`	`179`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* @author ochafik`
`9`	`9`	`*/`
`10`		`-class ReusablePointers {`
	`10`	`+final class ReusablePointers {`
`11`	`11`	`public final ReusablePointer`
`12`	`12`	`sizeT3_1 = new ReusablePointer(3 * SizeT.SIZE),`
`13`	`13`	`sizeT3_2 = new ReusablePointer(3 * SizeT.SIZE),`