diff --git a/Lumberjack/DDFileLogger.m b/Lumberjack/DDFileLogger.m
index ea9cc804a..0aeeda4c7 100644
--- a/Lumberjack/DDFileLogger.m
+++ b/Lumberjack/DDFileLogger.m
@@ -1042,16 +1042,14 @@ - (NSTimeInterval)age
 
 - (NSString *)description
 {
-	return [[NSDictionary dictionaryWithObjectsAndKeys:
-		self.filePath, @"filePath",
-		self.fileName, @"fileName",
-		self.fileAttributes, @"fileAttributes",
-		self.creationDate, @"creationDate",
-		self.modificationDate, @"modificationDate",
-		[NSNumber numberWithUnsignedLongLong:self.fileSize], @"fileSize",
-		[NSNumber numberWithDouble:self.age], @"age",
-		[NSNumber numberWithBool:self.isArchived], @"isArchived",
-	nil] description];
+	return [@{@"filePath": self.filePath,
+		@"fileName": self.fileName,
+		@"fileAttributes": self.fileAttributes,
+		@"creationDate": self.creationDate,
+		@"modificationDate": self.modificationDate,
+		@"fileSize": @(self.fileSize),
+		@"age": @(self.age),
+		@"isArchived": @(self.isArchived)} description];
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Lumberjack/Extensions/ContextFilterLogFormatter.m b/Lumberjack/Extensions/ContextFilterLogFormatter.m
index 570efde99..9c024acc1 100644
--- a/Lumberjack/Extensions/ContextFilterLogFormatter.m
+++ b/Lumberjack/Extensions/ContextFilterLogFormatter.m
@@ -148,7 +148,7 @@ - (void)addToSet:(int)loggingContext
 {
 	OSSpinLockLock(&lock);
 	{
-		[set addObject:[NSNumber numberWithInt:loggingContext]];
+		[set addObject:@(loggingContext)];
 	}
 	OSSpinLockUnlock(&lock);
 }
@@ -157,7 +157,7 @@ - (void)removeFromSet:(int)loggingContext
 {
 	OSSpinLockLock(&lock);
 	{
-		[set removeObject:[NSNumber numberWithInt:loggingContext]];
+		[set removeObject:@(loggingContext)];
 	}
 	OSSpinLockUnlock(&lock);
 }
@@ -181,7 +181,7 @@ - (BOOL)isInSet:(int)loggingContext
 	
 	OSSpinLockLock(&lock);
 	{
-		result = [set containsObject:[NSNumber numberWithInt:loggingContext]];
+		result = [set containsObject:@(loggingContext)];
 	}
 	OSSpinLockUnlock(&lock);
 	
diff --git a/Lumberjack/Extensions/DispatchQueueLogFormatter.m b/Lumberjack/Extensions/DispatchQueueLogFormatter.m
index 8c7d8d1b0..38f0aa020 100644
--- a/Lumberjack/Extensions/DispatchQueueLogFormatter.m
+++ b/Lumberjack/Extensions/DispatchQueueLogFormatter.m
@@ -124,7 +124,7 @@ - (NSString *)queueThreadLabelForLogMessage:(DDLogMessage *)logMessage
 		NSString *abrvLabel;
 		
 		if (useQueueLabel)
-			fullLabel = [NSString stringWithUTF8String:logMessage->queueLabel];
+			fullLabel = @(logMessage->queueLabel);
 		else
 			fullLabel = logMessage->threadName;