Index: libcfa/src/concurrency/locks.cfa
===================================================================
--- libcfa/src/concurrency/locks.cfa	(revision fbaea97009f70b67f476a193ca6b049a1100402d)
+++ libcfa/src/concurrency/locks.cfa	(revision 00675ed4c2f48a20d015179ca8dc1e151fce57a5)
@@ -347,5 +347,5 @@
 	bool notify_one( cond_lock(L) & this ) with( this ) {
 		lock( lock __cfaabi_dbg_ctx2 );
-		bool ret = ! isEmpty( blocked_threads );
+		bool ret = ! empty( blocked_threads );
 		process_popped(this, remove_first( blocked_threads ));
 		unlock( lock );
@@ -355,6 +355,6 @@
 	bool notify_all( cond_lock(L) & this ) with(this) {
 		lock( lock __cfaabi_dbg_ctx2 );
-		bool ret = ! isEmpty( blocked_threads );
-		while( ! isEmpty( blocked_threads ) ) {
+		bool ret = ! empty( blocked_threads );
+		while( ! empty( blocked_threads ) ) {
 			process_popped(this, remove_first( blocked_threads ));
 		}
@@ -364,10 +364,10 @@
 
 	uintptr_t front( cond_lock(L) & this ) with(this) {
-		return isEmpty( blocked_threads ) ? NULL : first( blocked_threads ).info;
+		return empty( blocked_threads ) ? NULL : first( blocked_threads ).info;
 	}
 
 	bool empty( cond_lock(L) & this ) with(this) {
 		lock( lock __cfaabi_dbg_ctx2 );
-		bool ret = isEmpty( blocked_threads );
+		bool ret = empty( blocked_threads );
 		unlock( lock );
 		return ret;
@@ -455,5 +455,5 @@
 
 	bool notify_one( fast_cond_var(L) & this ) with(this) {
-		bool ret = ! isEmpty( blocked_threads );
+		bool ret = ! empty( blocked_threads );
 		if ( ret ) {
 			info_thread(L) & popped = remove_first( blocked_threads );
@@ -463,6 +463,6 @@
 	}
 	bool notify_all( fast_cond_var(L) & this ) with(this) {
-		bool ret = ! isEmpty( blocked_threads );
-		while( ! isEmpty( blocked_threads ) ) {
+		bool ret = ! empty( blocked_threads );
+		while( ! empty( blocked_threads ) ) {
 			info_thread(L) & popped = remove_first( blocked_threads );
 			on_notify(*popped.lock, popped.t);
@@ -471,6 +471,6 @@
 	}
 
-	uintptr_t front( fast_cond_var(L) & this ) with(this) { return isEmpty( blocked_threads ) ? NULL : first( blocked_threads ).info; }
-	bool empty ( fast_cond_var(L) & this ) with(this) { return isEmpty( blocked_threads ); }
+	uintptr_t front( fast_cond_var(L) & this ) with(this) { return empty( blocked_threads ) ? NULL : first( blocked_threads ).info; }
+	bool empty ( fast_cond_var(L) & this ) with(this) { return empty( blocked_threads ); }
 
 	void wait( fast_cond_var(L) & this, L & l ) {
@@ -503,5 +503,5 @@
 	bool notify_one( pthread_cond_var(L) & this ) with(this) { 
 		lock( lock __cfaabi_dbg_ctx2 );
-		bool ret = ! isEmpty( blocked_threads );
+		bool ret = ! empty( blocked_threads );
 		if ( ret ) {
 			info_thread(L) & popped = remove_first( blocked_threads );
@@ -515,6 +515,6 @@
 	bool notify_all( pthread_cond_var(L) & this ) with(this) { 
 		lock( lock __cfaabi_dbg_ctx2 );
-		bool ret = ! isEmpty( blocked_threads );
-		while( ! isEmpty( blocked_threads ) ) {
+		bool ret = ! empty( blocked_threads );
+		while( ! empty( blocked_threads ) ) {
 			info_thread(L) & popped = remove_first( blocked_threads );
 			popped.signalled = true;
@@ -525,6 +525,6 @@
 	}
 
-	uintptr_t front( pthread_cond_var(L) & this ) with(this) { return isEmpty( blocked_threads ) ? NULL : first( blocked_threads ).info; }
-	bool empty ( pthread_cond_var(L) & this ) with(this) { return isEmpty( blocked_threads ); }
+	uintptr_t front( pthread_cond_var(L) & this ) with(this) { return empty( blocked_threads ) ? NULL : first( blocked_threads ).info; }
+	bool empty ( pthread_cond_var(L) & this ) with(this) { return empty( blocked_threads ); }
 
 	static void queue_info_thread_timeout( pthread_cond_var(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) {