@@ -44,11 +44,11 @@
 - (void)setFileName: (OFString *)fileName
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *old;
 
-	if ([fileName UTF8StringLength] > UINT16_MAX)
+	if (fileName.UTF8StringLength > UINT16_MAX)
 		@throw [OFOutOfRangeException exception];
 
 	old = _fileName;
 	_fileName = [fileName copy];
 	[old release];
@@ -59,11 +59,11 @@
 - (void)setFileComment: (OFString *)fileComment
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *old;
 
-	if ([fileComment UTF8StringLength] > UINT16_MAX)
+	if (fileComment.UTF8StringLength > UINT16_MAX)
 		@throw [OFOutOfRangeException exception];
 
 	old = _fileComment;
 	_fileComment = [fileComment copy];
 	[old release];
@@ -74,14 +74,14 @@
 - (void)setExtraField: (OFData *)extraField
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFData *old;
 
-	if ([extraField itemSize] != 1)
+	if (extraField.itemSize != 1)
 		@throw [OFInvalidArgumentException exception];
 
-	if ([extraField count] > UINT16_MAX)
+	if (extraField.count > UINT16_MAX)
 		@throw [OFOutOfRangeException exception];
 
 	old = _extraField;
 	_extraField = [extraField copy];
 	[old release];
@@ -101,15 +101,15 @@
 
 - (void)setModificationDate: (OFDate *)date
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	_lastModifiedFileDate = ((([date localYear] - 1980) & 0xFF) << 9) |
-	    (([date localMonthOfYear] & 0x0F) << 5) |
-	    ([date localDayOfMonth] & 0x1F);
-	_lastModifiedFileTime = (([date localHour] & 0x1F) << 11) |
-	    (([date localMinute] & 0x3F) << 5) | (([date second] >> 1) & 0x0F);
+	_lastModifiedFileDate = (((date.localYear - 1980) & 0xFF) << 9) |
+	    ((date.localMonthOfYear & 0x0F) << 5) |
+	    (date.localDayOfMonth & 0x1F);
+	_lastModifiedFileTime = ((date.localHour & 0x1F) << 11) |
+	    ((date.localMinute & 0x3F) << 5) | ((date.second >> 1) & 0x0F);
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)setCompressionMethod: (uint16_t)compressionMethod