@@ -74,11 +74,11 @@
     OFString *string)
 {
 	void *pool = objc_autoreleasePoolPush();
 	of_dns_resource_record_class_t recordClass;
 
-	string = [string uppercaseString];
+	string = string.uppercaseString;
 
 	if ([string isEqual: @"IN"])
 		recordClass = OF_DNS_RESOURCE_RECORD_CLASS_IN;
 	else
 		@throw [OFInvalidArgumentException exception];
@@ -92,11 +92,11 @@
     OFString *string)
 {
 	void *pool = objc_autoreleasePoolPush();
 	of_dns_resource_record_type_t recordType;
 
-	string = [string uppercaseString];
+	string = string.uppercaseString;
 
 	if ([string isEqual: @"A"])
 		recordType = OF_DNS_RESOURCE_RECORD_TYPE_A;
 	else if ([string isEqual: @"NS"])
 		recordType = OF_DNS_RESOURCE_RECORD_TYPE_NS;
@@ -169,11 +169,11 @@
 	    @"\tName = %@\n"
 	    @"\tClass = %@\n"
 	    @"\tType = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_dns_resource_record_class_to_string(_recordClass),
 	    of_dns_resource_record_type_to_string(_recordType), _TTL];
 }
 @end
 
@@ -233,11 +233,11 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
 	OF_HASH_ADD_HASH(hash, of_socket_address_hash(&_address));
@@ -253,11 +253,11 @@
 	    @"<%@:\n"
 	    @"\tName = %@\n"
 	    @"\tAddress = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_socket_address_ip_string(&_address, NULL), _TTL];
 }
 @end
 
 @implementation OFAAAADNSResourceRecord
@@ -316,11 +316,11 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
 	OF_HASH_ADD_HASH(hash, of_socket_address_hash(&_address));
@@ -336,11 +336,11 @@
 	    @"<%@:\n"
 	    @"\tName = %@\n"
 	    @"\tAddress = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_socket_address_ip_string(&_address, NULL), _TTL];
 }
 @end
 
 @implementation OFCNAMEDNSResourceRecord
@@ -410,16 +410,16 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
-	OF_HASH_ADD_HASH(hash, [_alias hash]);
+	OF_HASH_ADD_HASH(hash, _alias.hash);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
@@ -431,11 +431,11 @@
 	    @"\tName = %@\n"
 	    @"\tClass = %@\n"
 	    @"\tAlias = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_dns_resource_record_class_to_string(_recordClass), _alias, _TTL];
 }
 @end
 
 @implementation OFHINFODNSResourceRecord
@@ -510,17 +510,17 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
-	OF_HASH_ADD_HASH(hash, [_CPU hash]);
-	OF_HASH_ADD_HASH(hash, [_OS hash]);
+	OF_HASH_ADD_HASH(hash, _CPU.hash);
+	OF_HASH_ADD_HASH(hash, _OS.hash);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
@@ -533,11 +533,11 @@
 	    @"\tClass = %@\n"
 	    @"\tCPU = %@\n"
 	    @"\tOS = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_dns_resource_record_class_to_string(_recordClass), _CPU, _OS,
 	    _TTL];
 }
 @end
 
@@ -613,18 +613,18 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
 	OF_HASH_ADD(hash, _preference >> 8);
 	OF_HASH_ADD(hash, _preference);
-	OF_HASH_ADD_HASH(hash, [_mailExchange hash]);
+	OF_HASH_ADD_HASH(hash, _mailExchange.hash);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
@@ -637,11 +637,11 @@
 	    @"\tClass = %@\n"
 	    @"\tPreference = %" PRIu16 "\n"
 	    @"\tMail Exchange = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_dns_resource_record_class_to_string(_recordClass), _preference,
 	    _mailExchange, _TTL];
 }
 @end
 
@@ -712,16 +712,16 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
-	OF_HASH_ADD_HASH(hash, [_authoritativeHost hash]);
+	OF_HASH_ADD_HASH(hash, _authoritativeHost.hash);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
@@ -733,11 +733,11 @@
 	    @"\tName = %@\n"
 	    @"\tClass = %@\n"
 	    @"\tAuthoritative Host = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_dns_resource_record_class_to_string(_recordClass),
 	    _authoritativeHost, _TTL];
 }
 @end
 
@@ -808,16 +808,16 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
-	OF_HASH_ADD_HASH(hash, [_domainName hash]);
+	OF_HASH_ADD_HASH(hash, _domainName.hash);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
@@ -829,11 +829,11 @@
 	    @"\tName = %@\n"
 	    @"\tClass = %@\n"
 	    @"\tDomain Name = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_dns_resource_record_class_to_string(_recordClass), _domainName,
 	    _TTL];
 }
 @end
 
@@ -911,17 +911,17 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
-	OF_HASH_ADD_HASH(hash, [_mailbox hash]);
-	OF_HASH_ADD_HASH(hash, [_TXTDomainName hash]);
+	OF_HASH_ADD_HASH(hash, _mailbox.hash);
+	OF_HASH_ADD_HASH(hash, _TXTDomainName.hash);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
@@ -934,11 +934,11 @@
 	    @"\tClass = %@\n"
 	    @"\tMailbox = %@\n"
 	    @"\tTXT Domain Name = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_dns_resource_record_class_to_string(_recordClass), _mailbox,
 	    _TXTDomainName, _TTL];
 }
 @end
 
@@ -1045,17 +1045,17 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
-	OF_HASH_ADD_HASH(hash, [_primaryNameServer hash]);
-	OF_HASH_ADD_HASH(hash, [_responsiblePerson hash]);
+	OF_HASH_ADD_HASH(hash, _primaryNameServer.hash);
+	OF_HASH_ADD_HASH(hash, _responsiblePerson.hash);
 	OF_HASH_ADD(hash, _serialNumber >> 24);
 	OF_HASH_ADD(hash, _serialNumber >> 16);
 	OF_HASH_ADD(hash, _serialNumber >> 8);
 	OF_HASH_ADD(hash, _serialNumber);
 	OF_HASH_ADD(hash, _refreshInterval >> 24);
@@ -1093,11 +1093,11 @@
 	    @"\tRetry Interval = %" PRIu32 "\n"
 	    @"\tExpiration Interval = %" PRIu32 "\n"
 	    @"\tMinimum TTL = %" PRIu32 "\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_dns_resource_record_class_to_string(_recordClass),
 	    _primaryNameServer, _responsiblePerson, _serialNumber,
 	    _refreshInterval, _retryInterval, _expirationInterval, _minTTL,
 	    _TTL];
 }
@@ -1185,20 +1185,20 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
 	OF_HASH_ADD(hash, _priority >> 8);
 	OF_HASH_ADD(hash, _priority);
 	OF_HASH_ADD(hash, _weight >> 8);
 	OF_HASH_ADD(hash, _weight);
-	OF_HASH_ADD_HASH(hash, [_target hash]);
+	OF_HASH_ADD_HASH(hash, _target.hash);
 	OF_HASH_ADD(hash, _port >> 8);
 	OF_HASH_ADD(hash, _port);
 
 	OF_HASH_FINALIZE(hash);
 
@@ -1214,11 +1214,11 @@
 	    @"\tWeight = %" PRIu16 "\n"
 	    @"\tTarget = %@\n"
 	    @"\tPort = %" PRIu16 "\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name, _priority, _weight, _target, _port, _TTL];
+	    self.className, _name, _priority, _weight, _target, _port, _TTL];
 }
 @end
 
 @implementation OFTXTDNSResourceRecord
 @synthesize textData = _textData;
@@ -1287,16 +1287,16 @@
 {
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	OF_HASH_ADD_HASH(hash, [_name hash]);
+	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _recordClass >> 8);
 	OF_HASH_ADD(hash, _recordClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
-	OF_HASH_ADD_HASH(hash, [_textData hash]);
+	OF_HASH_ADD_HASH(hash, _textData.hash);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
@@ -1308,10 +1308,10 @@
 	    @"\tName = %@\n"
 	    @"\tClass = %@\n"
 	    @"\tText Data = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    [self className], _name,
+	    self.className, _name,
 	    of_dns_resource_record_class_to_string(_recordClass), _textData,
 	    _TTL];
 }
 @end