@@ -65,13 +65,12 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	of_list_object_t *iter;
-
-	for (iter = _firstListObject; iter != NULL; iter = iter->next)
+	for (of_list_object_t *iter = _firstListObject;
+	    iter != NULL; iter = iter->next)
 		[iter->object release];
 
 	[super dealloc];
 }
 
@@ -227,30 +226,28 @@
 	return true;
 }
 
 - (bool)containsObject: (id)object
 {
-	of_list_object_t *iter;
-
 	if (_count == 0)
 		return false;
 
-	for (iter = _firstListObject; iter != NULL; iter = iter->next)
+	for (of_list_object_t *iter = _firstListObject;
+	    iter != NULL; iter = iter->next)
 		if ([iter->object isEqual: object])
 			return true;
 
 	return false;
 }
 
 - (bool)containsObjectIdenticalTo: (id)object
 {
-	of_list_object_t *iter;
-
 	if (_count == 0)
 		return false;
 
-	for (iter = _firstListObject; iter != NULL; iter = iter->next)
+	for (of_list_object_t *iter = _firstListObject;
+	    iter != NULL; iter = iter->next)
 		if (iter->object == object)
 			return true;
 
 	return false;
 }
@@ -272,17 +269,18 @@
 }
 
 - copy
 {
 	OFList *copy = [[[self class] alloc] init];
-	of_list_object_t *iter, *listObject, *previous;
+	of_list_object_t *listObject, *previous;
 
 	listObject = NULL;
 	previous = NULL;
 
 	@try {
-		for (iter = _firstListObject; iter != NULL; iter = iter->next) {
+		for (of_list_object_t *iter = _firstListObject;
+		    iter != NULL; iter = iter->next) {
 			listObject = [copy allocMemoryWithSize:
 			    sizeof(of_list_object_t)];
 			listObject->object = [iter->object retain];
 			listObject->next = NULL;
 			listObject->previous = previous;
@@ -306,16 +304,16 @@
 	return copy;
 }
 
 - (uint32_t)hash
 {
-	of_list_object_t *iter;
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 
-	for (iter = _firstListObject; iter != NULL; iter = iter->next)
+	for (of_list_object_t *iter = _firstListObject;
+	    iter != NULL; iter = iter->next)
 		OF_HASH_ADD_HASH(hash, [iter->object hash]);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
@@ -322,18 +320,18 @@
 }
 
 - (OFString*)description
 {
 	OFMutableString *ret;
-	of_list_object_t *iter;
 
 	if (_count == 0)
 		return @"[]";
 
 	ret = [OFMutableString stringWithString: @"[\n"];
 
-	for (iter = _firstListObject; iter != NULL; iter = iter->next) {
+	for (of_list_object_t *iter = _firstListObject;
+	    iter != NULL; iter = iter->next) {
 		void *pool = objc_autoreleasePoolPush();
 
 		[ret appendString: [iter->object description]];
 
 		if (iter->next != NULL)
@@ -350,17 +348,16 @@
 	return ret;
 }
 
 - (OFXMLElement*)XMLElementBySerializing
 {
-	OFXMLElement *element;
-	of_list_object_t *iter;
+	OFXMLElement *element =
+	    [OFXMLElement elementWithName: [self className]
+				namespace: OF_SERIALIZATION_NS];
 
-	element = [OFXMLElement elementWithName: [self className]
-				      namespace: OF_SERIALIZATION_NS];
-
-	for (iter = _firstListObject; iter != NULL; iter = iter->next) {
+	for (of_list_object_t *iter = _firstListObject;
+	    iter != NULL; iter = iter->next) {
 		void *pool = objc_autoreleasePoolPush();
 
 		[element addChild: [iter->object XMLElementBySerializing]];
 
 		objc_autoreleasePoolPop(pool);
@@ -372,11 +369,10 @@
 - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
 			   objects: (id*)objects
 			     count: (int)count
 {
 	of_list_object_t *listObject;
-	int i;
 
 	memcpy(&listObject, state->extra, sizeof(listObject));
 
 	state->itemsPtr = objects;
 	state->mutationsPtr = &_mutations;
@@ -384,11 +380,11 @@
 	if (state->state == 0) {
 		listObject = _firstListObject;
 		state->state = 1;
 	}
 
-	for (i = 0; i < count; i++) {
+	for (int i = 0; i < count; i++) {
 		if (listObject == NULL)
 			return i;
 
 		objects[i] = listObject->object;
 		listObject = listObject->next;