Index: src/libcfa/concurrency/monitor
===================================================================
--- src/libcfa/concurrency/monitor	(revision 80c72a74b7b601bae8a1d23cc9a13665b1f15e5a)
+++ src/libcfa/concurrency/monitor	(revision 6b224a52e644258a65fc4b1af5b45c5d9c835149)
@@ -22,13 +22,13 @@
 #include "stdlib"
 
-static inline void ?{}(monitor_desc * this) {
-	(&this->lock){};
-	this->owner = NULL;
-	(&this->entry_queue){};
-	(&this->signal_stack){};
-	this->recursion = 0;
-	this->acceptables = NULL;
-	this->acceptable_count = 0;
-	this->accepted_index = -1;
+static inline void ?{}(monitor_desc & this) {
+	(this.lock){};
+	this.owner = NULL;
+	(this.entry_queue){};
+	(this.signal_stack){};
+	this.recursion = 0;
+	this.acceptables = NULL;
+	this.acceptable_count = 0;
+	this.accepted_index = -1;
 }
 
@@ -45,6 +45,6 @@
 }
 
-void ?{}( monitor_guard_t * this, monitor_desc ** m, int count, void (*func)() );
-void ^?{}( monitor_guard_t * this );
+void ?{}( monitor_guard_t & this, monitor_desc ** m, int count );
+void ^?{}( monitor_guard_t & this );
 
 //-----------------------------------------------------------------------------
@@ -71,5 +71,5 @@
 };
 
-void ?{}( __condition_blocked_queue_t * );
+void ?{}( __condition_blocked_queue_t & );
 void append( __condition_blocked_queue_t *, __condition_node_t * );
 __condition_node_t * pop_head( __condition_blocked_queue_t * );
@@ -81,11 +81,11 @@
 };
 
-static inline void ?{}( condition * this ) {
-	this->monitors = NULL;
-	this->monitor_count = 0;
+static inline void ?{}( condition & this ) {
+	this.monitors = NULL;
+	this.monitor_count = 0;
 }
 
-static inline void ^?{}( condition * this ) {
-	free( this->monitors );
+static inline void ^?{}( condition & this ) {
+	free( this.monitors );
 }