@@ -120,21 +120,21 @@
 	return [[[OFMD5Hash alloc] init] autorelease];
 }
 
 - init
 {
-	if ((self = [super init])) {
-		buf[0] = 0x67452301;
-		buf[1] = 0xEFCDAB89;
-		buf[2] = 0x98BADCFE;
-		buf[3] = 0x10325476;
-
-		bits[0] = 0;
-		bits[1] = 0;
-
-		calculated = NO;
-	}
+	self = [super init];
+
+	buf[0] = 0x67452301;
+	buf[1] = 0xEFCDAB89;
+	buf[2] = 0x98BADCFE;
+	buf[3] = 0x10325476;
+
+	bits[0] = 0;
+	bits[1] = 0;
+
+	calculated = NO;
 
 	return self;
 }
 
 - updateWithBuffer: (const char*)buffer
@@ -363,18 +363,18 @@
 	return [[[OFSHA1Hash alloc] init] autorelease];
 }
 
 - init
 {
-	if ((self = [super init])) {
-		count = 0;
-		state[0] = 0x67452301;
-		state[1] = 0xEFCDAB89;
-		state[2] = 0x98BADCFE;
-		state[3] = 0x10325476;
-		state[4] = 0xC3D2E1F0;
-	}
+	self = [super init];
+
+	count = 0;
+	state[0] = 0x67452301;
+	state[1] = 0xEFCDAB89;
+	state[2] = 0x98BADCFE;
+	state[3] = 0x10325476;
+	state[4] = 0xC3D2E1F0;
 
 	return self;
 }
 
 - updateWithBuffer: (const char*)buf