@@ -62,14 +62,14 @@
 	return [[self alloc] initWithClass: class_];
 }
 
 - initWithClass: (Class)class_
 {
-	if ((self = [super init])) {
-		class = class_;
-		string = NULL;
-	}
+	self = [super init];
+
+	class = class_;
+	string = NULL;
 
 	return self;
 }
 
 - free
@@ -100,12 +100,13 @@
 }
 
 - initWithClass: (Class)class_
 	andSize: (size_t)size
 {
-	if ((self = [super initWithClass: class_]))
-		req_size = size;
+	self = [super initWithClass: class_];
+
+	req_size = size;
 
 	return self;
 }
 
 - (const char*)cString
@@ -134,12 +135,13 @@
 }
 
 - initWithClass: (Class)class_
      andPointer: (void*)ptr
 {
-	if ((self = [super initWithClass: class_]))
-		pointer = ptr;
+	self = [super initWithClass: class_];
+
+	pointer = ptr;
 
 	return self;
 }
 
 - (const char*)cString
@@ -170,12 +172,13 @@
 }
 
 - initWithClass: (Class)class_
     andSelector: (SEL)selector_
 {
-	if ((self = [super initWithClass: class_]))
-		selector = selector_;
+	self = [super initWithClass: class_];
+
+	selector = selector_;
 
 	return self;
 }
 
 - (const char*)cString
@@ -211,12 +214,13 @@
 }
 
 - initWithClass: (Class)class_
     andSelector: (SEL)selector_
 {
-	if ((self = [super initWithClass: class_]))
-		selector = selector_;
+	self = [super initWithClass: class_];
+
+	selector = selector_;
 
 	return self;
 }
 
 - (const char*)cString
@@ -280,15 +284,15 @@
 
 - initWithClass: (Class)class_
 	andPath: (const char*)path_
 	andMode: (const char*)mode_
 {
-	if ((self = [super initWithClass: class_])) {
-		path = (path_ != NULL ? strdup(path_) : NULL);
-		mode = (mode_ != NULL ? strdup(mode_) : NULL);
-		err = GET_ERR;
-	}
+	self = [super initWithClass: class_];
+
+	path = (path_ != NULL ? strdup(path_) : NULL);
+	mode = (mode_ != NULL ? strdup(mode_) : NULL);
+	err = GET_ERR;
 
 	return self;
 }
 
 - free
@@ -347,29 +351,29 @@
 
 - initWithClass: (Class)class_
 	andSize: (size_t)size
       andNItems: (size_t)nitems
 {
-	if ((self = [super initWithClass: class_])) {
-		req_size = size;
-		req_items = nitems;
-		has_items = YES;
-		err = GET_ERR;
-	}
+	self = [super initWithClass: class_];
+
+	req_size = size;
+	req_items = nitems;
+	has_items = YES;
+	err = GET_ERR;
 
 	return self;
 }
 
 - initWithClass: (Class)class_
 	andSize: (size_t)size
 {
-	if ((self = [super initWithClass: class_])) {
-		req_size = size;
-		req_items = 0;
-		has_items = NO;
-		err = GET_ERR;
-	}
+	self = [super initWithClass: class_];
+
+	req_size = size;
+	req_items = 0;
+	has_items = NO;
+	err = GET_ERR;
 
 	return self;
 }
 
 - (int)errNo
@@ -494,15 +498,15 @@
 
 - initWithClass: (Class)class_
 	andNode: (const char*)node_
      andService: (const char*)service_
 {
-	if ((self = [super initWithClass: class_])) {
-		node = (node_ != NULL ? strdup(node_) : NULL);
-		service = (service_ != NULL ? strdup(service_) : NULL);
-		err = GET_SOCK_ERR;
-	}
+	self = [super initWithClass: class_];
+
+	node = (node_ != NULL ? strdup(node_) : NULL);
+	service = (service_ != NULL ? strdup(service_) : NULL);
+	err = GET_SOCK_ERR;
 
 	return self;
 }
 
 - free
@@ -558,15 +562,15 @@
 
 - initWithClass: (Class)class_
 	andHost: (const char*)host_
 	andPort: (uint16_t)port_
 {
-	if ((self = [super initWithClass: class_])) {
-		host = (host_ != NULL ? strdup(host_) : NULL);
-		port = port_;
-		err = GET_SOCK_ERR;
-	}
+	self = [super initWithClass: class_];
+
+	host = (host_ != NULL ? strdup(host_) : NULL);
+	port = port_;
+	err = GET_SOCK_ERR;
 
 	return self;
 }
 
 - free
@@ -619,16 +623,16 @@
 - initWithClass: (Class)class_
 	andHost: (const char*)host_
 	andPort: (uint16_t)port_
       andFamily: (int)family_
 {
-	if ((self = [super initWithClass: class_])) {
-		host = (host_ != NULL ? strdup(host_) : NULL);
-		port = port_;
-		family = family_;
-		err = GET_SOCK_ERR;
-	}
+	self = [super initWithClass: class_];
+
+	host = (host_ != NULL ? strdup(host_) : NULL);
+	port = port_;
+	family = family_;
+	err = GET_SOCK_ERR;
 
 	return self;
 }
 
 - free
@@ -680,14 +684,14 @@
 }
 
 - initWithClass: (Class)class_
      andBackLog: (int)backlog_
 {
-	if ((self = [super initWithClass: class_])) {
-		backlog = backlog_;
-		err = GET_SOCK_ERR;
-	}
+	self = [super initWithClass: class_];
+
+	backlog = backlog_;
+	err = GET_SOCK_ERR;
 
 	return self;
 }
 
 - (const char*)cString
@@ -713,12 +717,13 @@
 @end
 
 @implementation OFAcceptFailedException
 - initWithClass: (Class)class_
 {
-	if ((self = [super initWithClass: class_]))
-		err = GET_SOCK_ERR;
+	self = [super initWithClass: class_];
+
+	err = GET_SOCK_ERR;
 
 	return self;
 }
 
 - (const char*)cString