Index: benchmark/readyQ/churn.cfa
===================================================================
--- benchmark/readyQ/churn.cfa	(revision 3e417bf195abe70eb3b45b5adb21bac52d29ca67)
+++ benchmark/readyQ/churn.cfa	(revision 75965a6a63ea1e2e99384204281cd620b1df6f11)
@@ -21,5 +21,5 @@
 	wait( sem );
 	for() {
-		uint64_t r = thread_rand();
+		uint32_t r = prng();
 		bench_sem * next = __atomic_exchange_n(&spots[r % spot_cnt], &sem, __ATOMIC_SEQ_CST);
 		if(next) post( *next );
Index: benchmark/readyQ/locality.cfa
===================================================================
--- benchmark/readyQ/locality.cfa	(revision 3e417bf195abe70eb3b45b5adb21bac52d29ca67)
+++ benchmark/readyQ/locality.cfa	(revision 75965a6a63ea1e2e99384204281cd620b1df6f11)
@@ -128,10 +128,10 @@
 __attribute__((noinline)) void work(MyData & data, size_t cnt_, uint64_t & state) {
 	for (cnt_) {
-		access(data, __xorshift64(state));
+		access(data, xorshift_13_7_17(state));
 	}
 }
 
 void main(MyThread & this) {
-	uint64_t state = thread_rand();
+	uint64_t state = prng();
 
 	// Wait for start
@@ -144,5 +144,5 @@
 
 		// Wait on a random spot
-		uint64_t idx = __xorshift64(state) % this.spots.len;
+		uint64_t idx = xorshift_13_7_17(state) % this.spots.len;
 		bool closed = put(*this.spots.ptr[idx], this, this.data, this.share);