@@ -29,12 +29,13 @@
 #import "OFInvalidFormatException.h"
 #import "OFOutOfRangeException.h"
 
 @interface OFNumber ()
 + (instancetype)of_alloc;
-- (OFString *)of_JSONRepresentationWithOptions: (int)options
-					 depth: (size_t)depth;
+- (OFString *)
+    of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options
+			       depth: (size_t)depth;
 @end
 
 @interface OFNumberPlaceholder: OFNumber
 @end
 
@@ -1071,26 +1072,28 @@
 - (OFString *)JSONRepresentation
 {
 	return [self of_JSONRepresentationWithOptions: 0 depth: 0];
 }
 
-- (OFString *)JSONRepresentationWithOptions: (int)options
+- (OFString *)JSONRepresentationWithOptions:
+    (OFJSONRepresentationOptions)options
 {
 	return [self of_JSONRepresentationWithOptions: options depth: 0];
 }
 
-- (OFString *)of_JSONRepresentationWithOptions: (int)options
-					 depth: (size_t)depth
+- (OFString *)
+    of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options
+			       depth: (size_t)depth
 {
 	double doubleValue;
 
 	if (*self.objCType == 'B')
 		return (self.boolValue ? @"true" : @"false");
 
 	doubleValue = self.doubleValue;
 	if (isinf(doubleValue)) {
-		if (options & OF_JSON_REPRESENTATION_JSON5) {
+		if (options & OFJSONRepresentationOptionJSON5) {
 			if (doubleValue > 0)
 				return @"Infinity";
 			else
 				return @"-Infinity";
 		} else