@@ -42,11 +42,11 @@
 			data: (OFData *)data
 {
 	self = [super init];
 
 	@try {
-		if (data == nil || [data itemSize] != 1)
+		if (data == nil || data.itemSize != 1)
 			@throw [OFInvalidArgumentException exception];
 
 		_type = type;
 		_data = [data copy];
 	} @catch (id e) {
@@ -66,11 +66,11 @@
 
 - (OFData *)messagePackRepresentation
 {
 	OFMutableData *ret;
 	uint8_t prefix;
-	size_t count = [_data count];
+	size_t count = _data.count;
 
 	if (count == 1) {
 		ret = [OFMutableData dataWithCapacity: 3];
 
 		prefix = 0xD4;
@@ -143,12 +143,12 @@
 			count: 4];
 
 		[ret addItem: &_type];
 	}
 
-	[ret addItems: [_data items]
-		count: [_data count]];
+	[ret addItems: _data.items
+		count: _data.count];
 
 	[ret makeImmutable];
 
 	return ret;
 }
@@ -182,11 +182,11 @@
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
 	OF_HASH_ADD(hash, (uint8_t)_type);
-	OF_HASH_ADD_HASH(hash, [_data hash]);
+	OF_HASH_ADD_HASH(hash, _data.hash);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }