diff --git a/SignalServiceKit/src/Loki/JSON.swift b/SignalServiceKit/src/Loki/JSON.swift
new file mode 100644
index 000000000..e4c7ef8af
--- /dev/null
+++ b/SignalServiceKit/src/Loki/JSON.swift
@@ -0,0 +1,2 @@
+
+public typealias JSON = [String:String]
diff --git a/SignalServiceKit/src/Loki/LokiMessage.swift b/SignalServiceKit/src/Loki/LokiMessage.swift
index af065008b..c1680ca6c 100644
--- a/SignalServiceKit/src/Loki/LokiMessage.swift
+++ b/SignalServiceKit/src/Loki/LokiMessage.swift
@@ -42,7 +42,7 @@ public struct LokiMessage {
         }
     }
     
-    public func toJSON() -> [String:String] {
+    public func toJSON() -> JSON {
         var result = [ "destination" : destination, "data" : data.description, "ttl" : String(ttl) ]
         if let timestamp = timestamp, let nonce = nonce {
             result["timestamp"] = String(timestamp)
diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index d06710c8c..4bef8ecdb 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -1495,7 +1495,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
     // Loki: Since we don't support multi-device sending yet, just send it to the primary device
     NSMutableArray<NSNumber *> *deviceIds = @[@(OWSDevicePrimaryDeviceId)];
 
-    /* Original code:
+    /* Loki: Original code:
     NSMutableArray<NSNumber *> *deviceIds = [recipient.devices mutableCopy];
      */