@@ -198,16 +198,11 @@
 	arguments = [[OFMutableArray alloc] init];
 
 	for (i = 1; i < *argc; i++)
 		[arguments addObject: [OFString stringWithCString: (*argv)[i]]];
 
-	/*
-	 * Class swizzle the arguments to be immutable, as we don't need to
-	 * change them anymore and expose them only as OFArray*. But not
-	 * swizzling it would create a real copy each time -[copy] is called.
-	 */
-	arguments->isa = [OFArray class];
+	[arguments makeImmutable];
 
 	[pool release];
 }
 
 - (void)getArgumentCount: (int**)argc_