diff --git a/Signal/src/audio/incall_audio/RemoteIOAudio.m b/Signal/src/audio/incall_audio/RemoteIOAudio.m
index 231666f18..ee2a9b2be 100644
--- a/Signal/src/audio/incall_audio/RemoteIOAudio.m
+++ b/Signal/src/audio/incall_audio/RemoteIOAudio.m
@@ -255,7 +255,7 @@ static OSStatus playbackCallback(void *inRefCon,
         
         if (availableByteCount < requestedByteCount) {
             NSUInteger starveAmount = requestedByteCount - availableByteCount;
-            [instance->starveLogger markOccurrence:[NSNumber numberWithDouble:starveAmount]];
+            [instance->starveLogger markOccurrence:@(starveAmount)];
         } else {
             NSData* audioToCopyVolatile = [[instance playbackQueue] dequeuePotentialyVolatileDataWithLength:requestedByteCount];
             memcpy(ioData->mBuffers[0].mData, [audioToCopyVolatile bytes], [audioToCopyVolatile length]);
@@ -309,7 +309,7 @@ static OSStatus playbackCallback(void *inRefCon,
     } else if (resultCode == errSecParam){
         failure = @"oneOrMoreNonValidParameter";
     }else {
-        failure = [[NSNumber numberWithInt:resultCode] description];
+        failure = [@(resultCode) description];
     }
     [conditionLogger logError:[NSString stringWithFormat:@"StatusCheck failed: %@", failure]];
 }
diff --git a/Signal/src/audio/incall_audio/processing/JitterQueue.m b/Signal/src/audio/incall_audio/processing/JitterQueue.m
index 9dcb9019d..581a4fa91 100644
--- a/Signal/src/audio/incall_audio/processing/JitterQueue.m
+++ b/Signal/src/audio/incall_audio/processing/JitterQueue.m
@@ -34,7 +34,7 @@
         return false;
     }
     
-    [idsInJitterQueue addObject:[NSNumber numberWithUnsignedInt:sequenceNumber]];
+    [idsInJitterQueue addObject:@(sequenceNumber)];
     [resultPriorityQueue enqueue:audioPacket];
     if ([NumberUtil congruentDifferenceMod2ToThe16From:largestLatestEnqueued to:sequenceNumber] > 0) {
         largestLatestEnqueued = sequenceNumber;
@@ -58,7 +58,7 @@
         badArrivalType = JitterBadArrivalType_Stale;
     } else if (sequenceNumberRelativeToReadHead > READ_HEAD_MAX_QUEUE_AHEAD) {
         badArrivalType = JitterBadArrivalType_TooSoon;
-    } else if ([idsInJitterQueue containsObject:[NSNumber numberWithUnsignedInt:sequenceNumber]]) {
+    } else if ([idsInJitterQueue containsObject:@(sequenceNumber)]) {
         badArrivalType = JitterBadArrivalType_Duplicate;
     } else {
         return true;
@@ -100,7 +100,7 @@
     
     EncodedAudioPacket* discarded = [resultPriorityQueue dequeue];
     uint16_t discardedSequenceNumber = [discarded sequenceNumber];
-    [idsInJitterQueue removeObject:[NSNumber numberWithUnsignedInt:discardedSequenceNumber]];
+    [idsInJitterQueue removeObject:@(discardedSequenceNumber)];
     
     uint16_t oldReadHeadMax = readHeadMin+readHeadSpan-1;
     readHeadMin = [[resultPriorityQueue peek] sequenceNumber];
@@ -124,7 +124,7 @@
     EncodedAudioPacket* result = [resultPriorityQueue dequeue];
     readHeadMin = [result sequenceNumber]+1;
     readHeadSpan = 1;
-    [idsInJitterQueue removeObject:[NSNumber numberWithUnsignedInt:[result sequenceNumber]]];
+    [idsInJitterQueue removeObject:@([result sequenceNumber])];
     
     for (id<JitterQueueNotificationReceiver> e in watchers) {
         [e notifyDequeue:[result sequenceNumber] withRemainingEnqueuedItemCount:[idsInJitterQueue count]];
diff --git a/Signal/src/call/RecentCall.m b/Signal/src/call/RecentCall.m
index 4c87486e0..ea0906a2d 100644
--- a/Signal/src/call/RecentCall.m
+++ b/Signal/src/call/RecentCall.m
@@ -36,7 +36,7 @@ NSString *const CALL_TYPE_IMAGE_NAME_OUTGOING = @"outgoing_call_icon";
 #pragma mark - Serialization
 
 - (void)encodeWithCoder:(NSCoder *)encoder {
-    [encoder encodeObject:[NSNumber numberWithInt:callType] forKey:DEFAULTS_KEY_CALL_TYPE];
+    [encoder encodeObject:@(callType) forKey:DEFAULTS_KEY_CALL_TYPE];
     [encoder encodeObject:phoneNumber forKey:DEFAULTS_KEY_PHONE_NUMBER];
     [encoder encodeObject:@((int)contactRecordID) forKey:DEFAULTS_KEY_CONTACT_ID];
     [encoder encodeObject:date forKey:DEFAULTS_KEY_DATE];
diff --git a/Signal/src/network/rtp/RtpPacket.m b/Signal/src/network/rtp/RtpPacket.m
index 152815946..c109730ed 100644
--- a/Signal/src/network/rtp/RtpPacket.m
+++ b/Signal/src/network/rtp/RtpPacket.m
@@ -161,7 +161,7 @@ andSynchronizationSourceIdentifier:(uint32_t)synchronizedSourceIdentifier
     NSMutableArray* contributingSources = [NSMutableArray array];
     for (NSUInteger i = 0; i < contributingSourceCount; i++) {
         uint32_t ccsrc = [packetData bigEndianUInt32At:*offset];
-        [contributingSources addObject:[NSNumber numberWithUnsignedLong:ccsrc]];
+        [contributingSources addObject:@(ccsrc)];
         *offset += CONTRIBUTING_SOURCE_ID_LENGTH;
     }
     
diff --git a/Signal/src/network/rtp/zrtp/packets/HelloPacket.m b/Signal/src/network/rtp/zrtp/packets/HelloPacket.m
index cbc1797ac..6861c41c6 100644
--- a/Signal/src/network/rtp/zrtp/packets/HelloPacket.m
+++ b/Signal/src/network/rtp/zrtp/packets/HelloPacket.m
@@ -205,11 +205,11 @@
     uint8_t authIdsCount = [flags lowUint4AtByteOffset:AUTH_ID_AND_CIPHER_ID_FLAG_INDEX];
     uint8_t agreeIdsCount = [flags highUint4AtByteOffset:SAS_ID_AND_AGREE_ID_FLAG_INDEX];
     uint8_t sasIdsCount = [flags lowUint4AtByteOffset:SAS_ID_AND_AGREE_ID_FLAG_INDEX];
-    NSArray* counts = @[[NSNumber numberWithUnsignedInteger:hashIdsCount],
-                        [NSNumber numberWithUnsignedInteger:cipherIdsCount],
-                        [NSNumber numberWithUnsignedInteger:authIdsCount],
-                        [NSNumber numberWithUnsignedInteger:agreeIdsCount],
-                        [NSNumber numberWithUnsignedInteger:sasIdsCount]];
+    NSArray* counts = @[@(hashIdsCount),
+                        @(cipherIdsCount),
+                        @(authIdsCount),
+                        @(agreeIdsCount),
+                        @(sasIdsCount)];
     
     NSArray* specIds = [HelloPacket getSpecIdsFromPayload:payload counts:counts];
     hashIds = specIds[HASH_IDS_INDEX];