diff --git a/tokio-trace/tokio-trace-core/src/field.rs b/tokio-trace/tokio-trace-core/src/field.rs
index 0d85e6715..9bc5649c1 100644
--- a/tokio-trace/tokio-trace-core/src/field.rs
+++ b/tokio-trace/tokio-trace-core/src/field.rs
@@ -538,6 +538,14 @@ impl fmt::Debug for FieldSet {
     }
 }
 
+impl fmt::Display for FieldSet {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_set()
+            .entries(self.names.iter().map(|n| display(n)))
+            .finish()
+    }
+}
+
 // ===== impl Iter =====
 
 impl Iterator for Iter {
@@ -614,6 +622,21 @@ impl<'a> fmt::Debug for ValueSet<'a> {
                 }
                 dbg
             })
+            .field("callsite", &self.callsite())
+            .finish()
+    }
+}
+
+impl<'a> fmt::Display for ValueSet<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.values
+            .iter()
+            .fold(&mut f.debug_map(), |dbg, (key, v)| {
+                if let Some(val) = v {
+                    val.record(key, dbg);
+                }
+                dbg
+            })
             .finish()
     }
 }
diff --git a/tokio-trace/tokio-trace-core/src/metadata.rs b/tokio-trace/tokio-trace-core/src/metadata.rs
index d003c156e..e7c656f34 100644
--- a/tokio-trace/tokio-trace-core/src/metadata.rs
+++ b/tokio-trace/tokio-trace-core/src/metadata.rs
@@ -209,14 +209,32 @@ impl<'a> Metadata<'a> {
 
 impl<'a> fmt::Debug for Metadata<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Metadata")
-            .field("name", &self.name)
+        let mut meta = f.debug_struct("Metadata");
+        meta.field("name", &self.name)
             .field("target", &self.target)
-            .field("level", &self.level)
-            .field("module_path", &self.module_path)
-            .field("file", &self.file)
-            .field("line", &self.line)
-            .field("field_names", &self.fields)
+            .field("level", &self.level);
+
+        if let Some(path) = self.module_path() {
+            meta.field("module_path", &path);
+        }
+
+        match (self.file(), self.line()) {
+            (Some(file), Some(line)) => {
+                meta.field("location", &format_args!("{}:{}", file, line));
+            }
+            (Some(file), None) => {
+                meta.field("file", &format_args!("{}", file));
+            }
+
+            // Note: a line num with no file is a kind of weird case that _probably_ never occurs...
+            (None, Some(line)) => {
+                meta.field("line", &line);
+            }
+            (None, None) => {}
+        };
+
+        meta.field("fields", &format_args!("{}", self.fields))
+            .field("callsite", &self.callsite())
             .finish()
     }
 }