@@ -393,11 +393,11 @@
 				usingSelector: @selector(description)
 				      options: 0];
 }
 
 - (OFString *)componentsJoinedByString: (OFString *)separator
-			       options: (int)options
+			       options: (OFArrayJoinOptions)options
 {
 	return [self componentsJoinedByString: separator
 				usingSelector: @selector(description)
 				      options: options];
 }
@@ -410,11 +410,11 @@
 				      options: 0];
 }
 
 - (OFString *)componentsJoinedByString: (OFString *)separator
 			 usingSelector: (SEL)selector
-			       options: (int)options
+			       options: (OFArrayJoinOptions)options
 {
 	OFMutableString *ret;
 
 	if (separator == nil)
 		@throw [OFInvalidArgumentException exception];
@@ -432,11 +432,11 @@
 		return component;
 	}
 
 	ret = [OFMutableString string];
 
-	if (options & OF_ARRAY_SKIP_EMPTY) {
+	if (options & OFArraySkipEmptyComponents) {
 		for (id object in self) {
 			void *pool = objc_autoreleasePoolPush();
 			OFString *component =
 			    [object performSelector: selector];
 
@@ -712,21 +712,21 @@
 	[new makeImmutable];
 	return new;
 }
 
 - (OFArray *)sortedArrayUsingSelector: (SEL)selector
-			      options: (int)options
+			      options: (OFArraySortOptions)options
 {
 	OFMutableArray *new = [[self mutableCopy] autorelease];
 	[new sortUsingSelector: selector options: options];
 	[new makeImmutable];
 	return new;
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (OFArray *)sortedArrayUsingComparator: (OFComparator)comparator
-				options: (int)options
+				options: (OFArraySortOptions)options
 {
 	OFMutableArray *new = [[self mutableCopy] autorelease];
 	[new sortUsingComparator: comparator options: options];
 	[new makeImmutable];
 	return new;
@@ -770,11 +770,11 @@
 	return [[[OFArrayEnumerator alloc] initWithArray: self
 					    mutationsPtr: NULL] autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block
+- (void)enumerateObjectsUsingBlock: (OFArrayEnumerationBlock)block
 {
 	size_t i = 0;
 	bool stop = false;
 
 	for (id object in self) {
@@ -816,11 +816,11 @@
 	[ret makeImmutable];
 	return ret;
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (OFArray *)mappedArrayUsingBlock: (of_array_map_block_t)block
+- (OFArray *)mappedArrayUsingBlock: (OFArrayMapBlock)block
 {
 	OFArray *ret;
 	size_t count = self.count;
 	id *tmp = of_alloc(count, sizeof(id));
 
@@ -836,11 +836,11 @@
 	}
 
 	return ret;
 }
 
-- (OFArray *)filteredArrayUsingBlock: (of_array_filter_block_t)block
+- (OFArray *)filteredArrayUsingBlock: (OFArrayFilterBlock)block
 {
 	OFArray *ret;
 	size_t count = self.count;
 	id *tmp = of_alloc(count, sizeof(id));
 
@@ -859,11 +859,11 @@
 	}
 
 	return ret;
 }
 
-- (id)foldUsingBlock: (of_array_fold_block_t)block
+- (id)foldUsingBlock: (OFArrayFoldBlock)block
 {
 	size_t count = self.count;
 	__block id current;
 
 	if (count == 0)