@@ -24,11 +24,11 @@
 #import "OFTaggedPointerColor.h"
 
 @interface OFColorSingleton: OFConcreteColor
 @end
 
-@interface OFColorPlaceholder: OFColorSingleton
+@interface OFColorPlaceholder: OFColor
 @end
 
 static struct {
 	Class isa;
 } placeholder;
@@ -63,31 +63,16 @@
 	return (id)[[OFConcreteColor alloc] initWithRed: red
 						  green: green
 						   blue: blue
 						  alpha: alpha];
 }
+
+OF_SINGLETON_METHODS
 @end
 
 @implementation OFColorSingleton
-- (instancetype)autorelease
-{
-	return self;
-}
-
-- (instancetype)retain
-{
-	return self;
-}
-
-- (void)release
-{
-}
-
-- (unsigned int)retainCount
-{
-	return OFMaxRetainCount;
-}
+OF_SINGLETON_METHODS
 @end
 
 @implementation OFColor
 + (void)initialize
 {