@@ -41,21 +41,21 @@
 {
 	return [[[self alloc] initWithName: name
 			       stringValue: stringValue] autorelease];
 }
 
-- initWithName: (OFString *)name
-   stringValue: (OFString *)stringValue
+- (instancetype)initWithName: (OFString *)name
+		 stringValue: (OFString *)stringValue
 {
 	return [self initWithName: name
 			namespace: nil
 		      stringValue: stringValue];
 }
 
-- initWithName: (OFString *)name
-     namespace: (OFString *)namespace
-   stringValue: (OFString *)stringValue
+- (instancetype)initWithName: (OFString *)name
+		   namespace: (OFString *)namespace
+		 stringValue: (OFString *)stringValue
 {
 	self = [super of_init];
 
 	@try {
 		_name = [name copy];
@@ -67,11 +67,11 @@
 	}
 
 	return self;
 }
 
-- initWithSerialization: (OFXMLElement *)element
+- (instancetype)initWithSerialization: (OFXMLElement *)element
 {
 	self = [super of_init];
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();