diff --git a/os/log.c b/os/log.c
index 440997a15..637366efd 100644
--- a/os/log.c
+++ b/os/log.c
@@ -670,8 +670,6 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
 {
     const char *type_str;
     char buf[1024];
-    const size_t size = sizeof(buf);
-    Bool newline;
     size_t len = 0;
 
     if (inSignalContext) {
@@ -685,17 +683,16 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
 
     /* if type_str is not "", prepend it and ' ', to message */
     if (type_str[0] != '\0')
-        len += Xscnprintf(&buf[len], size - len, "%s ", type_str);
+        len += Xscnprintf(&buf[len], sizeof(buf) - len, "%s ", type_str);
 
-    if (size - len > 1)
-        len += Xvscnprintf(&buf[len], size - len, format, args);
+    if (sizeof(buf) - len > 1)
+        len += Xvscnprintf(&buf[len], sizeof(buf) - len, format, args);
 
     /* Force '\n' at end of truncated line */
-    if (size - len == 1)
+    if (sizeof(buf) - len == 1)
         buf[len - 1] = '\n';
 
-    newline = (buf[len - 1] == '\n');
-    LogSWrite(verb, buf, len, newline);
+    LogSWrite(verb, buf, len, (buf[len - 1] == '\n'));
 }
 
 /* Log message with verbosity level specified. */
@@ -736,7 +733,6 @@ LogVMessageVerbSigSafe(MessageType type, int verb, const char *format, va_list a
     const char *type_str;
     char buf[1024];
     int len;
-    Bool newline;
 
     type_str = LogMessageTypeVerbString(type, verb);
     if (!type_str)
@@ -754,8 +750,7 @@ LogVMessageVerbSigSafe(MessageType type, int verb, const char *format, va_list a
     if (sizeof(buf) - len == 1)
         buf[len - 1] = '\n';
 
-    newline = (len > 0 && buf[len - 1] == '\n');
-    LogSWrite(verb, buf, len, newline);
+    LogSWrite(verb, buf, len, (len > 0 && buf[len - 1] == '\n'));
 }
 
 void
@@ -764,8 +759,6 @@ LogVHdrMessageVerb(MessageType type, int verb, const char *msg_format,
 {
     const char *type_str;
     char buf[1024];
-    const size_t size = sizeof(buf);
-    Bool newline;
     size_t len = 0;
     int (*vprintf_func)(char *, int, const char* _X_RESTRICT_KYWD f, va_list args)
             _X_ATTRIBUTE_PRINTF(3, 0);
@@ -786,20 +779,19 @@ LogVHdrMessageVerb(MessageType type, int verb, const char *msg_format,
 
     /* if type_str is not "", prepend it and ' ', to message */
     if (type_str[0] != '\0')
-        len += printf_func(&buf[len], size - len, "%s ", type_str);
+        len += printf_func(&buf[len], sizeof(buf) - len, "%s ", type_str);
 
-    if (hdr_format && size - len > 1)
-        len += vprintf_func(&buf[len], size - len, hdr_format, hdr_args);
+    if (hdr_format && sizeof(buf) - len > 1)
+        len += vprintf_func(&buf[len], sizeof(buf) - len, hdr_format, hdr_args);
 
-    if (msg_format && size - len > 1)
-        len += vprintf_func(&buf[len], size - len, msg_format, msg_args);
+    if (msg_format && sizeof(buf) - len > 1)
+        len += vprintf_func(&buf[len], sizeof(buf) - len, msg_format, msg_args);
 
     /* Force '\n' at end of truncated line */
-    if (size - len == 1)
+    if (sizeof(buf) - len == 1)
         buf[len - 1] = '\n';
 
-    newline = (buf[len - 1] == '\n');
-    LogSWrite(verb, buf, len, newline);
+    LogSWrite(verb, buf, len, (buf[len - 1] == '\n'));
 }
 
 void