Index: tests/concurrent/park/contention.cfa
===================================================================
--- tests/concurrent/park/contention.cfa	(revision 87b93323c11d412259391b6741a7bc4dcad8981e)
+++ tests/concurrent/park/contention.cfa	(revision e23542987c42024e758269c7930ff52bdaf97f78)
@@ -21,9 +21,9 @@
 		if(blocked[idx]) {
 			Thread * thrd = __atomic_exchange_n(&blocked[idx], 0p, __ATOMIC_SEQ_CST);
-			unpark( *thrd __cfaabi_dbg_ctx2 );
+			unpark( *thrd );
 		} else {
 			Thread * thrd = __atomic_exchange_n(&blocked[idx], &this, __ATOMIC_SEQ_CST);
-			unpark( *thrd __cfaabi_dbg_ctx2 );
-			park( __cfaabi_dbg_ctx );
+			unpark( *thrd );
+			park();
 		}
 	}
@@ -41,5 +41,5 @@
 			int idx = myrand() % blocked_size;
 			Thread * thrd = __atomic_exchange_n(&blocked[idx], 0p, __ATOMIC_SEQ_CST);
-			unpark( *thrd __cfaabi_dbg_ctx2 );
+			unpark( *thrd );
 			yield( myrand() % 20 );
 		}
Index: tests/concurrent/park/force_preempt.cfa
===================================================================
--- tests/concurrent/park/force_preempt.cfa	(revision 87b93323c11d412259391b6741a7bc4dcad8981e)
+++ tests/concurrent/park/force_preempt.cfa	(revision e23542987c42024e758269c7930ff52bdaf97f78)
@@ -30,5 +30,5 @@
 
 		// Unpark this thread, don't force a yield
-		unpark( this __cfaabi_dbg_ctx2 );
+		unpark( this );
 		assert(mask == 0xCAFEBABA);
 
@@ -43,5 +43,5 @@
 		// Park this thread,
 		assert(mask == (id_hash ^ 0xCAFEBABA));
-		park( __cfaabi_dbg_ctx );
+		park();
 		assert(mask == (id_hash ^ 0xCAFEBABA));
 
Index: tests/concurrent/park/start_parked.cfa
===================================================================
--- tests/concurrent/park/start_parked.cfa	(revision 87b93323c11d412259391b6741a7bc4dcad8981e)
+++ tests/concurrent/park/start_parked.cfa	(revision e23542987c42024e758269c7930ff52bdaf97f78)
@@ -3,5 +3,5 @@
 thread Parker {};
 void main( Parker & ) {
-	park( __cfaabi_dbg_ctx );
+	park();
 }
 
@@ -9,5 +9,5 @@
 	for(1000) {
 		Parker parker;
-		unpark( parker __cfaabi_dbg_ctx2 );
+		unpark( parker );
 	}
 	printf( "done\n" );									// non-empty .expect file