Index: libcfa/src/concurrency/actor.hfa
===================================================================
--- libcfa/src/concurrency/actor.hfa	(revision bebfc2e9e4649cb913f326934dd2c875b141ccf2)
+++ libcfa/src/concurrency/actor.hfa	(revision 0794365c9c215373ee5a04f6612329f33ec2b19b)
@@ -13,4 +13,6 @@
 #endif // CFA_DEBUG
 
+#define DEBUG_ABORT( cond, string ) CFA_DEBUG( if ( cond ) abort( string ) )
+
 // Define the default number of processors created in the executor. Must be greater than 0.
 #define __DEFAULT_EXECUTOR_PROCESSORS__ 2
@@ -42,7 +44,7 @@
 struct executor;
 
-enum Allocation { Nodelete, Delete, Destroy, Finished }; // allocation status
-
-typedef Allocation (*__receive_fn)(actor &, message &);
+enum allocation { Nodelete, Delete, Destroy, Finished }; // allocation status
+
+typedef allocation (*__receive_fn)(actor &, message &);
 struct request {
     actor * receiver;
@@ -393,5 +395,5 @@
 struct actor {
     size_t ticket;	                                    // executor-queue handle
-    Allocation allocation_;			                    // allocation action
+    allocation allocation_;			                    // allocation action
     inline virtual_dtor;
 };
@@ -400,5 +402,5 @@
     // Once an actor is allocated it must be sent a message or the actor system cannot stop. Hence, its receive
     // member must be called to end it
-    verifyf( __actor_executor_, "Creating actor before calling start_actor_system() can cause undefined behaviour.\n" ); 
+    DEBUG_ABORT( __actor_executor_ == 0p, "Creating actor before calling start_actor_system() can cause undefined behaviour.\n" );
     allocation_ = Nodelete;
     ticket = __get_next_ticket( *__actor_executor_ );
@@ -430,5 +432,5 @@
 
 struct message {
-    Allocation allocation_;			// allocation action
+    allocation allocation_;			// allocation action
     inline virtual_dtor;
 };
@@ -437,7 +439,7 @@
     this.allocation_ = Nodelete;
 }
-static inline void ?{}( message & this, Allocation allocation ) {
-    memcpy( &this.allocation_, &allocation, sizeof(allocation) ); // optimization to elide ctor
-    verifyf( this.allocation_ != Finished, "The Finished Allocation status is not supported for message types.\n");
+static inline void ?{}( message & this, allocation alloc ) {
+    memcpy( &this.allocation_, &alloc, sizeof(allocation) ); // optimization to elide ctor
+    DEBUG_ABORT( this.allocation_ == Finished, "The Finished allocation status is not supported for message types.\n" );
 }
 static inline void ^?{}( message & this ) with(this) {
@@ -453,10 +455,10 @@
     } // switch
 }
-static inline void set_allocation( message & this, Allocation state ) {
+static inline void set_allocation( message & this, allocation state ) {
     this.allocation_ = state;
 }
 
 static inline void deliver_request( request & this ) {
-    verifyf( this.receiver->ticket != (unsigned long int)MAX, "Attempted to send message to deleted/dead actor\n" );
+    DEBUG_ABORT( this.receiver->ticket == (unsigned long int)MAX, "Attempted to send message to deleted/dead actor\n" );
     this.receiver->allocation_ = this.fn( *this.receiver, *this.msg );
     check_message( *this.msg );
@@ -632,5 +634,5 @@
 
 static inline void send( actor & this, request & req ) {
-    verifyf( this.ticket != (unsigned long int)MAX, "Attempted to send message to deleted/dead actor\n" );
+    DEBUG_ABORT( this.ticket == (unsigned long int)MAX, "Attempted to send message to deleted/dead actor\n" );
     send( *__actor_executor_, req, this.ticket );
 }
@@ -685,6 +687,6 @@
 struct __finished_msg_t { inline message; } finished_msg = __base_msg_finished;
 
-Allocation receive( actor & this, __delete_msg_t & msg ) { return Delete; }
-Allocation receive( actor & this, __destroy_msg_t & msg ) { return Destroy; }
-Allocation receive( actor & this, __finished_msg_t & msg ) { return Finished; }
-
+allocation receive( actor & this, __delete_msg_t & msg ) { return Delete; }
+allocation receive( actor & this, __destroy_msg_t & msg ) { return Destroy; }
+allocation receive( actor & this, __finished_msg_t & msg ) { return Finished; }
+