1 files changed, 3 insertions, 8 deletions
diff --git a/chiselFrontend/src/main/scala/chisel3/core/Data.scala b/chiselFrontend/src/main/scala/chisel3/core/Data.scala
index 7ff1ec0b..d3d94b21 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Data.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Data.scala
@@ -250,14 +250,9 @@ abstract class Data extends HasId with NamedComponent {
     _binding = Some(target)
   }
 
-  private[core] def topBindingOpt: Option[TopBinding] = {
-    _binding match {
-      case Some(binding) => binding match {
-        case ChildBinding(parent) => parent.topBindingOpt
-        case binding: TopBinding => Some(binding)
-      }
-      case None => None
-    }
+  private[core] def topBindingOpt: Option[TopBinding] = _binding.map {
+    case ChildBinding(parent) => parent.topBinding
+    case bindingVal: TopBinding => bindingVal
   }
 
   private[core] def topBinding: TopBinding = topBindingOpt.get