@@ -46,19 +46,21 @@
 @end
 
 @interface OFDictionaryPlaceholder: OFDictionary
 @end
 
+OF_DIRECT_MEMBERS
 @interface OFDictionaryObjectEnumerator: OFEnumerator
 {
 	OFDictionary *_dictionary;
 	OFEnumerator *_keyEnumerator;
 }
 
 - (instancetype)initWithDictionary: (OFDictionary *)dictionary;
 @end
 
+OF_DIRECT_MEMBERS
 @interface OFURLQueryPartAllowedCharacterSet: OFCharacterSet
 + (OFCharacterSet *)URLQueryPartAllowedCharacterSet;
 @end
 
 @implementation OFDictionaryPlaceholder
@@ -222,11 +224,12 @@
 	return [[[self alloc] init] autorelease];
 }
 
 + (instancetype)dictionaryWithDictionary: (OFDictionary *)dictionary
 {
-	return [[[self alloc] initWithDictionary: dictionary] autorelease];
+	return [[(OFDictionary *)[self alloc]
+	    initWithDictionary: dictionary] autorelease];
 }
 
 + (instancetype)dictionaryWithObject: (id)object
 			      forKey: (id)key
 {