Index: tests/concurrent/park/.expect/force_preempt.txt
===================================================================
--- tests/concurrent/park/.expect/force_preempt.txt	(revision 50b88854c78d94229d63df8d800995aebc5797b4)
+++ tests/concurrent/park/.expect/force_preempt.txt	(revision 8c50aed95a361f33369903cfdf38ceaaefeffddf)
@@ -1,150 +1,75 @@
-0 Calling unpark (No Force) 0
-1 Calling unpark (No Force) 0
-2 Calling unpark (No Force) 0
-3 Calling unpark (No Force) 0
-4 Calling unpark (No Force) 0
-0 Parking (No Force) 0
-0 Unparked (No Force) 0
-0 Calling unpark (No Force) 1
-1 Parking (No Force) 0
-1 Unparked (No Force) 0
-1 Calling unpark (No Force) 1
-2 Parking (No Force) 0
-2 Unparked (No Force) 0
-2 Calling unpark (No Force) 1
-3 Parking (No Force) 0
-3 Unparked (No Force) 0
-3 Calling unpark (No Force) 1
-4 Parking (No Force) 0
-4 Unparked (No Force) 0
-4 Calling unpark (No Force) 1
-0 Parking (No Force) 1
-0 Unparked (No Force) 1
-0 Calling unpark (No Force) 2
-1 Parking (No Force) 1
-1 Unparked (No Force) 1
-1 Calling unpark (No Force) 2
-2 Parking (No Force) 1
-2 Unparked (No Force) 1
-2 Calling unpark (No Force) 2
-3 Parking (No Force) 1
-3 Unparked (No Force) 1
-3 Calling unpark (No Force) 2
-4 Parking (No Force) 1
-4 Unparked (No Force) 1
-4 Calling unpark (No Force) 2
-0 Parking (No Force) 2
-0 Unparked (No Force) 2
-0 Calling unpark (No Force) 3
-1 Parking (No Force) 2
-1 Unparked (No Force) 2
-1 Calling unpark (No Force) 3
-2 Parking (No Force) 2
-2 Unparked (No Force) 2
-2 Calling unpark (No Force) 3
-3 Parking (No Force) 2
-3 Unparked (No Force) 2
-3 Calling unpark (No Force) 3
-4 Parking (No Force) 2
-4 Unparked (No Force) 2
-4 Calling unpark (No Force) 3
-0 Parking (No Force) 3
-0 Unparked (No Force) 3
-0 Calling unpark (No Force) 4
-1 Parking (No Force) 3
-1 Unparked (No Force) 3
-1 Calling unpark (No Force) 4
-2 Parking (No Force) 3
-2 Unparked (No Force) 3
-2 Calling unpark (No Force) 4
-3 Parking (No Force) 3
-3 Unparked (No Force) 3
-3 Calling unpark (No Force) 4
-4 Parking (No Force) 3
-4 Unparked (No Force) 3
-4 Calling unpark (No Force) 4
-0 Parking (No Force) 4
-0 Unparked (No Force) 4
-0 Calling unpark (Force) 0
-1 Parking (No Force) 4
-1 Unparked (No Force) 4
-1 Calling unpark (Force) 0
-2 Parking (No Force) 4
-2 Unparked (No Force) 4
-2 Calling unpark (Force) 0
-3 Parking (No Force) 4
-3 Unparked (No Force) 4
-3 Calling unpark (Force) 0
-4 Parking (No Force) 4
-4 Unparked (No Force) 4
-4 Calling unpark (Force) 0
-0 Parking (Force) 0
-1 Parking (Force) 0
-2 Parking (Force) 0
-3 Parking (Force) 0
-4 Parking (Force) 0
-0 Unparked (Force) 0
-0 Calling unpark (Force) 1
-1 Unparked (Force) 0
-1 Calling unpark (Force) 1
-2 Unparked (Force) 0
-2 Calling unpark (Force) 1
-3 Unparked (Force) 0
-3 Calling unpark (Force) 1
-4 Unparked (Force) 0
-4 Calling unpark (Force) 1
-0 Parking (Force) 1
-1 Parking (Force) 1
-2 Parking (Force) 1
-3 Parking (Force) 1
-4 Parking (Force) 1
-0 Unparked (Force) 1
-0 Calling unpark (Force) 2
-1 Unparked (Force) 1
-1 Calling unpark (Force) 2
-2 Unparked (Force) 1
-2 Calling unpark (Force) 2
-3 Unparked (Force) 1
-3 Calling unpark (Force) 2
-4 Unparked (Force) 1
-4 Calling unpark (Force) 2
-0 Parking (Force) 2
-1 Parking (Force) 2
-2 Parking (Force) 2
-3 Parking (Force) 2
-4 Parking (Force) 2
-0 Unparked (Force) 2
-0 Calling unpark (Force) 3
-1 Unparked (Force) 2
-1 Calling unpark (Force) 3
-2 Unparked (Force) 2
-2 Calling unpark (Force) 3
-3 Unparked (Force) 2
-3 Calling unpark (Force) 3
-4 Unparked (Force) 2
-4 Calling unpark (Force) 3
-0 Parking (Force) 3
-1 Parking (Force) 3
-2 Parking (Force) 3
-3 Parking (Force) 3
-4 Parking (Force) 3
-0 Unparked (Force) 3
-0 Calling unpark (Force) 4
-1 Unparked (Force) 3
-1 Calling unpark (Force) 4
-2 Unparked (Force) 3
-2 Calling unpark (Force) 4
-3 Unparked (Force) 3
-3 Calling unpark (Force) 4
-4 Unparked (Force) 3
-4 Calling unpark (Force) 4
-0 Parking (Force) 4
-1 Parking (Force) 4
-2 Parking (Force) 4
-3 Parking (Force) 4
-4 Parking (Force) 4
-0 Unparked (Force) 4
-1 Unparked (Force) 4
-2 Unparked (Force) 4
-3 Unparked (Force) 4
-4 Unparked (Force) 4
+0 Calling unpark 0
+1 Calling unpark 0
+2 Calling unpark 0
+3 Calling unpark 0
+4 Calling unpark 0
+0 Parking 0
+0 Unparked 0
+0 Calling unpark 1
+1 Parking 0
+1 Unparked 0
+1 Calling unpark 1
+2 Parking 0
+2 Unparked 0
+2 Calling unpark 1
+3 Parking 0
+3 Unparked 0
+3 Calling unpark 1
+4 Parking 0
+4 Unparked 0
+4 Calling unpark 1
+0 Parking 1
+0 Unparked 1
+0 Calling unpark 2
+1 Parking 1
+1 Unparked 1
+1 Calling unpark 2
+2 Parking 1
+2 Unparked 1
+2 Calling unpark 2
+3 Parking 1
+3 Unparked 1
+3 Calling unpark 2
+4 Parking 1
+4 Unparked 1
+4 Calling unpark 2
+0 Parking 2
+0 Unparked 2
+0 Calling unpark 3
+1 Parking 2
+1 Unparked 2
+1 Calling unpark 3
+2 Parking 2
+2 Unparked 2
+2 Calling unpark 3
+3 Parking 2
+3 Unparked 2
+3 Calling unpark 3
+4 Parking 2
+4 Unparked 2
+4 Calling unpark 3
+0 Parking 3
+0 Unparked 3
+0 Calling unpark 4
+1 Parking 3
+1 Unparked 3
+1 Calling unpark 4
+2 Parking 3
+2 Unparked 3
+2 Calling unpark 4
+3 Parking 3
+3 Unparked 3
+3 Calling unpark 4
+4 Parking 3
+4 Unparked 3
+4 Calling unpark 4
+0 Parking 4
+0 Unparked 4
+1 Parking 4
+1 Unparked 4
+2 Parking 4
+2 Unparked 4
+3 Parking 4
+3 Unparked 4
+4 Parking 4
+4 Unparked 4
Index: tests/concurrent/park/force_preempt.cfa
===================================================================
--- tests/concurrent/park/force_preempt.cfa	(revision 50b88854c78d94229d63df8d800995aebc5797b4)
+++ tests/concurrent/park/force_preempt.cfa	(revision 8c50aed95a361f33369903cfdf38ceaaefeffddf)
@@ -20,10 +20,14 @@
 
 
-void park_loop(Waiter & this, int id, bool force) {
+volatile int count = 0;
+
+void main(Waiter & this) {
+	// Get a unique id
+	int id = __atomic_fetch_add(&count, 1, __ATOMIC_SEQ_CST);
 
 	for(int i = 0; i < 5; i++) {
 		// Unpark this thread, don't force a yield
-		sout | id | "Calling unpark" | (force ? "(Force)" : "(No Force)") | i;
-		unpark(this, force);
+		sout | id | "Calling unpark" | i;
+		unpark(this);
 
 		// Force a preemption before the call to park
@@ -32,21 +36,8 @@
 
 		// Park this thread,
-		sout | id | "Parking"  | (force ? "(Force)" : "(No Force)") | i;
+		sout | id | "Parking" | i;
 		park();
-		sout | id | "Unparked" | (force ? "(Force)" : "(No Force)") | i;
+		sout | id | "Unparked" | i;
 	}
-}
-
-volatile int count = 0;
-
-void main(Waiter & this) {
-	// Get a unique id
-	int id = __atomic_fetch_add(&count, 1, __ATOMIC_SEQ_CST);
-
-	// First without forcing yield
-	park_loop( this, id, false );
-
-	// First with forcing yield
-	park_loop( this, id, true  );
 }