diff --git a/lldb/source/Utility/Listener.cpp b/lldb/source/Utility/Listener.cpp
index 57755e1ac5c80..0454869841d52 100644
--- a/lldb/source/Utility/Listener.cpp
+++ b/lldb/source/Utility/Listener.cpp
@@ -258,7 +258,9 @@ bool Listener::GetEventInternal(
     Broadcaster *broadcaster, // nullptr for any broadcaster
     uint32_t event_type_mask, EventSP &event_sp) {
   Log *log = GetLog(LLDBLog::Events);
-  LLDB_LOG(log, "this = {0}, timeout = {1} for {2}", this, timeout, m_name);
+
+  LLDB_LOG(log, "{0} Listener('{1}'), timeout = {2}, event_type_mask = {3:x}",
+           this, m_name, timeout, event_type_mask);
 
   std::unique_lock<std::mutex> lock(m_events_mutex);
 
@@ -275,8 +277,7 @@ bool Listener::GetEventInternal(
 
       if (result == std::cv_status::timeout) {
         log = GetLog(LLDBLog::Events);
-        LLDB_LOGF(log, "%p Listener::GetEventInternal() timed out for %s",
-                  static_cast<void *>(this), m_name.c_str());
+        LLDB_LOG(log, "{0} Listener('{1}'), timed out", this, m_name);
         return false;
       } else if (result != std::cv_status::no_timeout) {
         log = GetLog(LLDBLog::Events);