diff --git a/report/topology.go b/report/topology.go
index 76cf3b97f..4aa83d090 100644
--- a/report/topology.go
+++ b/report/topology.go
@@ -12,8 +12,8 @@ import (
 // EdgeMetadatas and Nodes respectively. Edges are directional, and embedded
 // in the Node struct.
 type Topology struct {
-	Nodes // TODO(pb): remove Nodes intermediate type
-	Controls
+	Nodes    `json:"nodes"`
+	Controls `json:"controls,omitempty"`
 }
 
 // MakeTopology gives you a Topology.