diff --git a/lib/markdown_processor.dart b/lib/markdown_processor.dart
index 7a595ad735..d26536833b 100644
--- a/lib/markdown_processor.dart
+++ b/lib/markdown_processor.dart
@@ -110,28 +110,29 @@ NodeList<CommentReference> _getCommentRefs(ModelElement modelElement) {
   if (modelElement.documentation == null && modelElement.canOverride()) {
     var melement = modelElement.overriddenElement;
     if (melement != null &&
-        melement.element.node != null &&
-        melement.element.node is AnnotatedNode) {
-      var docComment =
-          (melement.element.node as AnnotatedNode).documentationComment;
+        melement.element.computeNode() != null &&
+        melement.element.computeNode() is AnnotatedNode) {
+      var docComment = (melement.element.computeNode() as AnnotatedNode)
+          .documentationComment;
       if (docComment != null) return docComment.references;
       return null;
     }
   }
-  if (modelElement.element.node is AnnotatedNode) {
-    if ((modelElement.element.node as AnnotatedNode).documentationComment !=
+  if (modelElement.element.computeNode() is AnnotatedNode) {
+    if ((modelElement.element.computeNode() as AnnotatedNode)
+            .documentationComment !=
         null) {
-      return (modelElement.element.node as AnnotatedNode)
+      return (modelElement.element.computeNode() as AnnotatedNode)
           .documentationComment
           .references;
     }
   } else if (modelElement.element is LibraryElement) {
     // handle anonymous libraries
-    if (modelElement.element.node == null ||
-        modelElement.element.node.parent == null) {
+    if (modelElement.element.computeNode() == null ||
+        modelElement.element.computeNode().parent == null) {
       return null;
     }
-    var node = modelElement.element.node.parent.parent;
+    var node = modelElement.element.computeNode().parent.parent;
     if (node is AnnotatedNode) {
       if ((node as AnnotatedNode).documentationComment != null) {
         return (node as AnnotatedNode).documentationComment.references;
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 41a6866a93..3078496492 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -155,8 +155,11 @@ abstract class ModelElement implements Comparable {
   List<String> get annotations {
     // Check https://code.google.com/p/dart/issues/detail?id=23181
     // If that is fixed, this code might get a lot easier
-    if (element.node != null && element.node is AnnotatedNode) {
-      return (element.node as AnnotatedNode).metadata.map((Annotation a) {
+    if (element.computeNode() != null &&
+        element.computeNode() is AnnotatedNode) {
+      return (element.computeNode() as AnnotatedNode)
+          .metadata
+          .map((Annotation a) {
         var annotationString = a.toSource().substring(1); // remove the @
         var e = a.element;
         if (e != null && (e is ConstructorElement)) {
@@ -1244,7 +1247,7 @@ class Enum extends Class {
 abstract class SourceCodeMixin {
   String get sourceCode {
     String contents = element.source.contents.data;
-    var node = element.node; // TODO: computeNode once we go to 0.25.2
+    var node = element.computeNode(); // TODO: computeNode once we go to 0.25.2
     // find the start of the line, so that we can line up all the indents
     int i = node.offset;
     while (i > 0) {
@@ -1369,8 +1372,8 @@ class Field extends ModelElement {
   String get constantValue {
     if (_constantValue != null) return _constantValue;
 
-    if (_field.node == null) return null;
-    var v = _field.node.toSource();
+    if (_field.computeNode() == null) return null;
+    var v = _field.computeNode().toSource();
     if (v == null) return null;
     var string = v.substring(v.indexOf('=') + 1, v.length).trim();
     _constantValue = string.replaceAll(modelType.name, modelType.linkedName);
@@ -1617,7 +1620,9 @@ class TopLevelVariable extends ModelElement {
   }
 
   String get constantValue {
-    var v = (_variable as ConstTopLevelVariableElementImpl).node.toSource();
+    var v = (_variable as ConstTopLevelVariableElementImpl)
+        .computeNode()
+        .toSource();
     if (v == null) return '';
     var string = v.substring(v.indexOf('=') + 1, v.length).trim();
     return string.replaceAll(modelType.name, modelType.linkedName);