Index: src/libcfa/concurrency/alarm.c
===================================================================
--- src/libcfa/concurrency/alarm.c	(revision ec354983739a5d35b830e3aa658b4311a1b5dfaa)
+++ src/libcfa/concurrency/alarm.c	(revision 0b3341212fbb806609b5965b1a50bb3e35fbe940)
@@ -99,5 +99,5 @@
 
 static inline void insert_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t p ) {
-	assert( !n->next );
+	verify( !n->next );
 	if( p == this->tail ) {
 		this->tail = &n->next;
@@ -108,5 +108,5 @@
 	*p = n;
 
-	LIB_DEBUG_DO( assert( validate( this ) ) );
+	verify( validate( this ) );
 }
 
@@ -119,5 +119,5 @@
 	insert_at( this, n, it );
 
-	LIB_DEBUG_DO( assert( validate( this ) ) );
+	verify( validate( this ) );
 }
 
@@ -131,5 +131,5 @@
 		head->next = NULL;
 	}
-	LIB_DEBUG_DO( assert( validate( this ) ) );
+	verify( validate( this ) );
 	return head;
 }
@@ -145,5 +145,5 @@
 	n->next = NULL;
 
-	LIB_DEBUG_DO( assert( validate( this ) ) );
+	verify( validate( this ) );
 }
 
@@ -154,17 +154,17 @@
 	}
 
-	LIB_DEBUG_DO( assert( validate( this ) ) );
+	verify( validate( this ) );
 
 	if( *it ) { remove_at( this, n, it ); }
 
-	LIB_DEBUG_DO( assert( validate( this ) ) );
+	verify( validate( this ) );
 }
 
 void register_self( alarm_node_t * this ) {
 	disable_interrupts();
-	assert( !systemProcessor->pending_alarm );
+	verify( !systemProcessor->pending_alarm );
 	lock( &systemProcessor->alarm_lock );
-	LIB_DEBUG_DO( assert( validate( &systemProcessor->alarms ) ) );
 	{
+		verify( validate( &systemProcessor->alarms ) );
 		bool first = !systemProcessor->alarms.head;
 
@@ -190,6 +190,8 @@
 	disable_interrupts();
 	lock( &systemProcessor->alarm_lock );
-	LIB_DEBUG_DO( assert( validate( &systemProcessor->alarms ) ) );
-	remove( &systemProcessor->alarms, this );
+	{
+		verify( validate( &systemProcessor->alarms ) );
+		remove( &systemProcessor->alarms, this );
+	}
 	unlock( &systemProcessor->alarm_lock );
 	disable_interrupts();
Index: src/libcfa/concurrency/kernel.c
===================================================================
--- src/libcfa/concurrency/kernel.c	(revision ec354983739a5d35b830e3aa658b4311a1b5dfaa)
+++ src/libcfa/concurrency/kernel.c	(revision 0b3341212fbb806609b5965b1a50bb3e35fbe940)
@@ -173,5 +173,5 @@
 	(&this->proc){ cltr, runner };
 
-	LIB_DEBUG_DO( assert( validate( &this->alarms ) ) );
+	verify( validate( &this->alarms ) );
 }
 
@@ -215,9 +215,9 @@
 			if(readyThread)
 			{
-				assert( disable_preempt_count > 0 );
+				verify( disable_preempt_count > 0 );
 
 				runThread(this, readyThread);
 
-				assert( disable_preempt_count > 0 );
+				verify( disable_preempt_count > 0 );
 
 				//Some actions need to be taken from the kernel
@@ -387,7 +387,7 @@
 void BlockInternal() {
 	disable_interrupts();
-	assert( disable_preempt_count > 0 );
+	verify( disable_preempt_count > 0 );
 	suspend();
-	assert( disable_preempt_count > 0 );
+	verify( disable_preempt_count > 0 );
 	enable_interrupts( __PRETTY_FUNCTION__ );
 }
@@ -397,7 +397,9 @@
 	this_processor->finish.action_code = Release;
 	this_processor->finish.lock = lock;
-	assert( disable_preempt_count > 0 );
+
+	verify( disable_preempt_count > 0 );
 	suspend();
-	assert( disable_preempt_count > 0 );
+	verify( disable_preempt_count > 0 );
+
 	enable_interrupts( __PRETTY_FUNCTION__ );
 }
@@ -407,7 +409,9 @@
 	this_processor->finish.action_code = Schedule;
 	this_processor->finish.thrd = thrd;
-	assert( disable_preempt_count > 0 );
+
+	verify( disable_preempt_count > 0 );
 	suspend();
-	assert( disable_preempt_count > 0 );
+	verify( disable_preempt_count > 0 );
+
 	enable_interrupts( __PRETTY_FUNCTION__ );
 }
@@ -418,7 +422,9 @@
 	this_processor->finish.lock = lock;
 	this_processor->finish.thrd = thrd;
-	assert( disable_preempt_count > 0 );
+
+	verify( disable_preempt_count > 0 );
 	suspend();
-	assert( disable_preempt_count > 0 );
+	verify( disable_preempt_count > 0 );
+
 	enable_interrupts( __PRETTY_FUNCTION__ );
 }
@@ -429,7 +435,9 @@
 	this_processor->finish.locks = locks;
 	this_processor->finish.lock_count = count;
-	assert( disable_preempt_count > 0 );
+
+	verify( disable_preempt_count > 0 );
 	suspend();
-	assert( disable_preempt_count > 0 );
+	verify( disable_preempt_count > 0 );
+
 	enable_interrupts( __PRETTY_FUNCTION__ );
 }
@@ -442,7 +450,9 @@
 	this_processor->finish.thrds = thrds;
 	this_processor->finish.thrd_count = thrd_count;
-	assert( disable_preempt_count > 0 );
+
+	verify( disable_preempt_count > 0 );
 	suspend();
-	assert( disable_preempt_count > 0 );
+	verify( disable_preempt_count > 0 );
+
 	enable_interrupts( __PRETTY_FUNCTION__ );
 }
Index: src/libcfa/concurrency/preemption.c
===================================================================
--- src/libcfa/concurrency/preemption.c	(revision ec354983739a5d35b830e3aa658b4311a1b5dfaa)
+++ src/libcfa/concurrency/preemption.c	(revision 0b3341212fbb806609b5965b1a50bb3e35fbe940)
@@ -107,6 +107,6 @@
 	}
 
-	LIB_DEBUG_DO(
-		assert( validate( alarms ) );
+	verify( validate( alarms ) );
+	LIB_DEBUG_DO(
 		len = snprintf( text, 256, "Ticking preemption done\n" );
 		LIB_DEBUG_WRITE( STDERR_FILENO, text, len );
@@ -165,16 +165,16 @@
 	void disable_interrupts() {
 		__attribute__((unused)) unsigned short new_val = __atomic_add_fetch_2( &disable_preempt_count, 1, __ATOMIC_SEQ_CST );
-		assert( new_val < (unsigned short)65_000 );
-		assert( new_val != (unsigned short) 0 );
+		verify( new_val < (unsigned short)65_000 );
+		verify( new_val != (unsigned short) 0 );
 	}
 
 	void enable_interrupts_noRF() {
 		unsigned short prev = __atomic_fetch_add_2( &disable_preempt_count, -1, __ATOMIC_SEQ_CST );
-		assert( prev != (unsigned short) 0 );
+		verify( prev != (unsigned short) 0 );
 	}
 
 	void enable_interrupts( const char * func ) {
 		unsigned short prev = __atomic_fetch_add_2( &disable_preempt_count, -1, __ATOMIC_SEQ_CST );
-		assert( prev != (unsigned short) 0 );
+		verify( prev != (unsigned short) 0 );
 		if( prev == 1 && this_processor->pending_preemption ) {
 			this_processor->pending_preemption = false;