Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -535,11 +535,11 @@
 AS_IF([test x"$cross_compiling" = x"yes"], [
 	AC_SUBST(BIN_PREFIX, "$host-")
 
 	case "$host" in
 		*-*-mingw*)
-			AC_CHECK_PROG(WINE, wine)
+			AC_CHECK_PROG(WINE, wine, wine)
 
 			AS_IF([test x"$WINE" != x""], [
 				AC_SUBST(TESTS, "tests")
 				AC_SUBST(TEST_LAUNCHER, "$WINE")
 			])

Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -101,11 +101,11 @@
  * \param firstObject The first object
  * \param arguments A va_list
  * \return An initialized OFArray
  */
 - initWithObject: (id)firstObject
-    argumentList: (va_list)arguments;
+       arguments: (va_list)arguments;
 
 /**
  * Initializes an OFArray with the objects from the specified C array.
  *
  * \param objects A C array of objects, terminated with nil

Index: src/OFArray.m
==================================================================
--- src/OFArray.m
+++ src/OFArray.m
@@ -44,11 +44,11 @@
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstObject);
 	ret = [[[self alloc] initWithObject: firstObject
-			       argumentList: arguments] autorelease];
+				  arguments: arguments] autorelease];
 	va_end(arguments);
 
 	return ret;
 }
 
@@ -98,18 +98,18 @@
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstObject);
 	ret = [self initWithObject: firstObject
-		      argumentList: arguments];
+			 arguments: arguments];
 	va_end(arguments);
 
 	return ret;
 }
 
 - initWithObject: (id)firstObject
-    argumentList: (va_list)arguments
+       arguments: (va_list)arguments
 {
 	self = [self init];
 
 	@try {
 		id object;

Index: src/OFDictionary.h
==================================================================
--- src/OFDictionary.h
+++ src/OFDictionary.h
@@ -143,12 +143,12 @@
  *
  * \param firstKey The first key
  * \param arguments A va_list of the other arguments
  * \return A new initialized OFDictionary
  */
--  initWithKey: (id <OFCopying>)firstKey
-  argumentList: (va_list)arguments;
+- initWithKey: (id <OFCopying>)firstKey
+    arguments: (va_list)arguments;
 
 /**
  * Returns the object for the given key or nil if the key was not found.
  *
  * The returned object is <i>not</i> retained and autoreleased for performance

Index: src/OFDictionary.m
==================================================================
--- src/OFDictionary.m
+++ src/OFDictionary.m
@@ -64,11 +64,11 @@
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstKey);
 	ret = [[[self alloc] initWithKey: firstKey
-			    argumentList: arguments] autorelease];
+			       arguments: arguments] autorelease];
 	va_end(arguments);
 
 	return ret;
 }
 
@@ -305,32 +305,34 @@
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstKey);
 	ret = [self initWithKey: firstKey
-		   argumentList: arguments];
+		      arguments: arguments];
 	va_end(arguments);
 
 	return ret;
 }
 
--  initWithKey: (id <OFCopying>)key
-  argumentList: (va_list)arguments
+- initWithKey: (id <OFCopying>)firstKey
+    arguments: (va_list)arguments
 {
 	self = [super init];
 
 	@try {
-		id object;
+		id key, object;
 		uint32_t i, j, hash, newSize;
 		va_list argumentsCopy;
 		struct of_dictionary_bucket *bucket;
 
 		va_copy(argumentsCopy, arguments);
 
-		if (key == nil)
+		if (firstKey == nil)
 			@throw [OFInvalidArgumentException newWithClass: isa
 							       selector: _cmd];
+
+		key = firstKey;
 
 		if ((object = va_arg(arguments, id)) == nil)
 			@throw [OFInvalidArgumentException newWithClass: isa
 							       selector: _cmd];
 

Index: src/OFString+XMLEscaping.m
==================================================================
--- src/OFString+XMLEscaping.m
+++ src/OFString+XMLEscaping.m
@@ -29,11 +29,11 @@
 @implementation OFString (XMLEscaping)
 - (OFString*)stringByXMLEscaping
 {
 	char *retCString;
 	const char *append;
-	size_t retLength, appendLength;
+	size_t retLength, appendLen;
 	size_t i, j;
 	OFString *ret;
 
 	j = 0;
 	retLength = length;
@@ -47,48 +47,48 @@
 
 	for (i = 0; i < length; i++) {
 		switch (string[i]) {
 			case '<':
 				append = "&lt;";
-				appendLength = 4;
+				appendLen = 4;
 				break;
 			case '>':
 				append = "&gt;";
-				appendLength = 4;
+				appendLen = 4;
 				break;
 			case '"':
 				append = "&quot;";
-				appendLength = 6;
+				appendLen = 6;
 				break;
 			case '\'':
 				append = "&apos;";
-				appendLength = 6;
+				appendLen = 6;
 				break;
 			case '&':
 				append = "&amp;";
-				appendLength = 5;
+				appendLen = 5;
 				break;
 			default:
 				append = NULL;
-				appendLength = 0;
+				appendLen = 0;
 		}
 
 		if (append != NULL) {
 			char *newRetCString;
 
 			if ((newRetCString = realloc(retCString,
-			    retLength + appendLength)) == NULL) {
+			    retLength + appendLen)) == NULL) {
 				free(retCString);
 				@throw [OFOutOfMemoryException
 				     newWithClass: isa
-				    requestedSize: retLength + appendLength];
+				    requestedSize: retLength + appendLen];
 			}
 			retCString = newRetCString;
-			retLength += appendLength - 1;
+			retLength += appendLen - 1;
 
-			memcpy(retCString + j, append, appendLength);
-			j += appendLength;
+			memcpy(retCString + j, append, appendLen);
+			j += appendLen;
 		} else
 			retCString[j++] = string[i];
 	}
 
 	assert(j == retLength);