@@ -260,28 +260,11 @@
 
 	return seconds;
 }
 
 @implementation OFDateSingleton
-- (instancetype)autorelease
-{
-	return self;
-}
-
-- (instancetype)retain
-{
-	return self;
-}
-
-- (void)release
-{
-}
-
-- (unsigned int)retainCount
-{
-	return OFMaxRetainCount;
-}
+OF_SINGLETON_METHODS
 @end
 
 @implementation OFDatePlaceholder
 #ifdef __clang__
 /* We intentionally don't call into super, so silence the warning. */
@@ -319,10 +302,12 @@
 	    initWithTimeIntervalSince1970: seconds];
 }
 #ifdef __clang__
 # pragma clang diagnostic pop
 #endif
+
+OF_SINGLETON_METHODS
 @end
 
 @implementation OFConcreteDate
 - (instancetype)initWithTimeIntervalSince1970: (OFTimeInterval)seconds
 {