@@ -15,11 +15,11 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFXMLElementBuilder";
+static OFString *const module = @"OFXMLElementBuilder";
 static OFXMLNode *nodes[2];
 static size_t i = 0;
 
 @implementation TestsAppDelegate (OFXMLElementBuilderTests)
 - (void)elementBuilder: (OFXMLElementBuilder *)builder
@@ -37,26 +37,26 @@
 }
 
 - (void)XMLElementBuilderTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFXMLParser *p = [OFXMLParser parser];
+	OFXMLParser *parser = [OFXMLParser parser];
 	OFXMLElementBuilder *builder = [OFXMLElementBuilder builder];
-	OFString *str = @"<foo>bar<![CDATA[f<oo]]>baz<qux/>"
+	OFString *string = @"<foo>bar<![CDATA[f<oo]]>baz<qux/>"
 	    " <qux xmlns:qux='urn:qux'><?asd?><qux:bar/><x qux:y='z'/></qux>"
 	    "</foo>";
 
-	p.delegate = builder;
+	parser.delegate = builder;
 	builder.delegate = self;
 
 	TEST(@"Building elements from parsed XML",
-	    R([p parseString: str]) &&
-	    nodes[0] != nil && [nodes[0].XMLString isEqual: str] &&
-	    R([p parseString: @"<!--foo-->"]) &&
+	    R([parser parseString: string]) &&
+	    nodes[0] != nil && [nodes[0].XMLString isEqual: string] &&
+	    R([parser parseString: @"<!--foo-->"]) &&
 	    nodes[1] != nil && [nodes[1].XMLString isEqual: @"<!--foo-->"] &&
 	    i == 2)
 
 	[nodes[0] release];
 	[nodes[1] release];
 	objc_autoreleasePoolPop(pool);
 }
 @end