diff --git a/Signal/src/ViewControllers/MediaGalleryViewController.swift b/Signal/src/ViewControllers/MediaGalleryViewController.swift
index 3126388f3..a406ac422 100644
--- a/Signal/src/ViewControllers/MediaGalleryViewController.swift
+++ b/Signal/src/ViewControllers/MediaGalleryViewController.swift
@@ -623,7 +623,7 @@ class MediaGalleryViewController: OWSNavigationController, MediaGalleryDataSourc
     // Range instead of indexSet since it's contiguous?
     var fetchedIndexSet = IndexSet() {
         didSet {
-            Logger.debug("\(oldValue) -> \(fetchedIndexSet)")
+            Logger.debug("\(oldValue) -> \(self.fetchedIndexSet)")
         }
     }
 
diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift
index 807d1d351..d7ec24c28 100644
--- a/Signal/src/call/CallService.swift
+++ b/Signal/src/call/CallService.swift
@@ -146,7 +146,7 @@ private class SignalCallData: NSObject {
         didSet {
             AssertIsOnMainThread()
 
-            Logger.debug(".peerConnectionClient setter: \(oldValue != nil) -> \(peerConnectionClient != nil) \(String(describing: peerConnectionClient))")
+            Logger.debug(".peerConnectionClient setter: \(oldValue != nil) -> \(self.peerConnectionClient != nil) \(String(describing: self.peerConnectionClient))")
         }
     }
 
@@ -253,7 +253,7 @@ private class SignalCallData: NSObject {
                 }
             }
 
-            Logger.debug(".callData setter: \(oldValue?.call.identifiersForLogs as Optional) -> \(callData?.call.identifiersForLogs as Optional)")
+            Logger.debug(".callData setter: \(oldValue?.call.identifiersForLogs as Optional) -> \(self.callData?.call.identifiersForLogs as Optional)")
 
             for observer in observers {
                 observer.value?.didUpdateCall(call: callData?.call)
diff --git a/Signal/src/call/SignalCall.swift b/Signal/src/call/SignalCall.swift
index 51a018803..ec2e37a4f 100644
--- a/Signal/src/call/SignalCall.swift
+++ b/Signal/src/call/SignalCall.swift
@@ -121,7 +121,7 @@ protocol CallObserver: class {
     var audioSource: AudioSource? = nil {
         didSet {
             AssertIsOnMainThread()
-            Logger.debug("audioSource changed: \(String(describing: oldValue)) -> \(String(describing: audioSource))")
+            Logger.debug("audioSource changed: \(String(describing: oldValue)) -> \(String(describing: self.audioSource))")
 
             for observer in observers {
                 observer.value?.audioSourceDidChange(call: self, audioSource: audioSource)
diff --git a/Signal/src/network/GiphyAPI.swift b/Signal/src/network/GiphyAPI.swift
index 3ca844f00..caa29d6a9 100644
--- a/Signal/src/network/GiphyAPI.swift
+++ b/Signal/src/network/GiphyAPI.swift
@@ -82,7 +82,7 @@ extension GiphyError: LocalizedError {
     }
 
     public func log() {
-        Logger.verbose("\t \(format), \(name), \(width), \(height), \(fileSize)")
+        Logger.verbose("\t \(self.format), \(self.name), \(self.width), \(self.height), \(self.fileSize)")
     }
 }
 
@@ -114,7 +114,7 @@ extension GiphyError: LocalizedError {
     }
 
     public func log() {
-        Logger.verbose("giphyId: \(giphyId), \(renditions.count)")
+        Logger.verbose("giphyId: \(self.giphyId), \(self.renditions.count)")
         for rendition in renditions {
             rendition.log()
         }
diff --git a/SignalMessaging/Views/DisappearingTimerConfigurationView.swift b/SignalMessaging/Views/DisappearingTimerConfigurationView.swift
index ac82faf14..5f0a9096a 100644
--- a/SignalMessaging/Views/DisappearingTimerConfigurationView.swift
+++ b/SignalMessaging/Views/DisappearingTimerConfigurationView.swift
@@ -28,13 +28,13 @@ public class DisappearingTimerConfigurationView: UIView {
 
     override public var frame: CGRect {
         didSet {
-            Logger.verbose("\(oldValue) -> \(frame)")
+            Logger.verbose("\(oldValue) -> \(self.frame)")
         }
     }
 
     override public var bounds: CGRect {
         didSet {
-            Logger.verbose("\(oldValue) -> \(bounds)")
+            Logger.verbose("\(oldValue) -> \(self.bounds)")
         }
     }
 
diff --git a/SignalMessaging/attachments/SignalAttachment.swift b/SignalMessaging/attachments/SignalAttachment.swift
index 18d2e18a2..f7afc66d1 100644
--- a/SignalMessaging/attachments/SignalAttachment.swift
+++ b/SignalMessaging/attachments/SignalAttachment.swift
@@ -160,7 +160,7 @@ public class SignalAttachment: NSObject {
             AssertIsOnMainThread()
 
             assert(oldValue == nil)
-            Logger.verbose("Attachment has error: \(String(describing: error))")
+            Logger.verbose("Attachment has error: \(String(describing: self.error))")
         }
     }
 
diff --git a/SignalMessaging/environment/OWSAudioSession.swift b/SignalMessaging/environment/OWSAudioSession.swift
index 6939e9f59..445df4a3e 100644
--- a/SignalMessaging/environment/OWSAudioSession.swift
+++ b/SignalMessaging/environment/OWSAudioSession.swift
@@ -142,7 +142,7 @@ public class OWSAudioSession: NSObject {
         }
 
         guard currentActivities.isEmpty else {
-            Logger.debug("not deactivating due to currentActivities: \(currentActivities)")
+            Logger.debug("not deactivating due to currentActivities: \(self.currentActivities)")
             return
         }
 
diff --git a/SignalServiceKit/src/Util/OWSLogger.h b/SignalServiceKit/src/Util/OWSLogger.h
index b7b353a46..63e403ab2 100644
--- a/SignalServiceKit/src/Util/OWSLogger.h
+++ b/SignalServiceKit/src/Util/OWSLogger.h
@@ -4,16 +4,18 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+typedef NSString * (^OWSLogBlock)(void);
+
 /**
  * A minimal DDLog wrapper for swift.
  */
 @interface OWSLogger : NSObject
 
-+ (void)verbose:(NSString *)logString;
-+ (void)debug:(NSString *)logString;
-+ (void)info:(NSString *)logString;
-+ (void)warn:(NSString *)logString;
-+ (void)error:(NSString *)logString;
++ (void)verbose:(OWSLogBlock)logBlock;
++ (void)debug:(OWSLogBlock)logBlock;
++ (void)info:(OWSLogBlock)logBlock;
++ (void)warn:(OWSLogBlock)logBlock;
++ (void)error:(OWSLogBlock)logBlock;
 + (void)flush;
 
 @end
diff --git a/SignalServiceKit/src/Util/OWSLogger.m b/SignalServiceKit/src/Util/OWSLogger.m
index ae1a484cb..36aaa3485 100644
--- a/SignalServiceKit/src/Util/OWSLogger.m
+++ b/SignalServiceKit/src/Util/OWSLogger.m
@@ -8,29 +8,29 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation OWSLogger
 
-+ (void)verbose:(NSString *)logString
++ (void)verbose:(OWSLogBlock)logBlock;
 {
-    DDLogVerbose(@"%@", logString);
+    DDLogVerbose(@"%@", logBlock());
 }
 
-+ (void)debug:(NSString *)logString
++ (void)debug:(OWSLogBlock)logBlock;
 {
-    DDLogDebug(@"%@", logString);
+    DDLogDebug(@"%@", logBlock());
 }
 
-+ (void)info:(NSString *)logString
++ (void)info:(OWSLogBlock)logBlock;
 {
-    DDLogInfo(@"%@", logString);
+    DDLogInfo(@"%@", logBlock());
 }
 
-+ (void)warn:(NSString *)logString
++ (void)warn:(OWSLogBlock)logBlock;
 {
-    DDLogWarn(@"%@", logString);
+    DDLogWarn(@"%@", logBlock());
 }
 
-+ (void)error:(NSString *)logString
++ (void)error:(OWSLogBlock)logBlock;
 {
-    DDLogError(@"%@", logString);
+    DDLogError(@"%@", logBlock());
 }
 
 + (void)flush
diff --git a/SignalServiceKit/src/Util/OWSLogger.swift b/SignalServiceKit/src/Util/OWSLogger.swift
index 6cbaa4660..b336b5baa 100644
--- a/SignalServiceKit/src/Util/OWSLogger.swift
+++ b/SignalServiceKit/src/Util/OWSLogger.swift
@@ -21,23 +21,25 @@ public func owsFormatLogMessage(_ logString: String,
  */
 open class Logger: NSObject {
 
-    open class func verbose(_ logString: @autoclosure () -> String,
+    open class func verbose(_ logString: @escaping @autoclosure () -> String,
                             file: String = #file,
                             function: String = #function,
                             line: Int = #line) {
         #if DEBUG
-        let message = owsFormatLogMessage(logString(), file: file, function: function, line: line)
-        OWSLogger.verbose(message)
+        OWSLogger.verbose({
+            return owsFormatLogMessage(logString(), file: file, function: function, line: line)
+        })
         #endif
     }
 
-    open class func debug(_ logString: @autoclosure () -> String,
+    open class func debug(_ logString: @escaping @autoclosure () -> String,
                           file: String = #file,
                           function: String = #function,
                           line: Int = #line) {
         #if DEBUG
-        let message = owsFormatLogMessage(logString(), file: file, function: function, line: line)
-        OWSLogger.debug(message)
+        OWSLogger.debug({
+            return owsFormatLogMessage(logString(), file: file, function: function, line: line)
+        })
         #endif
     }
 
@@ -45,24 +47,27 @@ open class Logger: NSObject {
                          file: String = #file,
                          function: String = #function,
                          line: Int = #line) {
-        let message = owsFormatLogMessage(logString, file: file, function: function, line: line)
-        OWSLogger.info(message)
+        OWSLogger.info({
+            return owsFormatLogMessage(logString, file: file, function: function, line: line)
+        })
     }
 
     open class func warn(_ logString: String,
                          file: String = #file,
                          function: String = #function,
                          line: Int = #line) {
-        let message = owsFormatLogMessage(logString, file: file, function: function, line: line)
-        OWSLogger.warn(message)
+        OWSLogger.warn({
+            return owsFormatLogMessage(logString, file: file, function: function, line: line)
+        })
     }
 
     open class func error(_ logString: String,
                           file: String = #file,
                           function: String = #function,
                           line: Int = #line) {
-        let message = owsFormatLogMessage(logString, file: file, function: function, line: line)
-        OWSLogger.error(message)
+        OWSLogger.error({
+            return owsFormatLogMessage(logString, file: file, function: function, line: line)
+        })
     }
 
     open class func flush() {