diff --git a/aidl_language.cpp b/aidl_language.cpp
index 5b94f9b..39db473 100644
--- a/aidl_language.cpp
+++ b/aidl_language.cpp
@@ -782,8 +782,8 @@
 void AidlVariableDeclaration::TraverseChildren(
     std::function<void(const AidlNode&)> traverse) const {
   traverse(GetType());
-  if (IsDefaultUserSpecified()) {
-    traverse(*GetDefaultValue());
+  if (auto default_value = GetDefaultValue(); default_value) {
+    traverse(*default_value);
   }
 }