diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 6d0f489..bce1f9d 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -77,16 +77,30 @@
  * @see template_preprocess_node()
  * @see template_process()
  */
+
+// Variables documented above as requiring a render() call can be rendered into
+// strings here, allowing the rest of this template to be easier to work with.
+$render_variables = array(
+  // Render $title_prefix and $title_suffix, without separating any subparts.
+  'title_prefix' => array(),
+  'title_suffix' => array(),
+  // Render $content, but separate the links and comments subparts into their
+  // own variables: $links and $content_comments.
+  'content' => array('links', 'comments' => 'content_comments'),
+);
+
+// Do not modify the following line.
+extract(template_render_variables($variables, $render_variables));
 ?>
 <div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
 
   <?php print $user_picture; ?>
 
-  <?php print render($title_prefix); ?>
+  <?php print $title_prefix; ?>
   <?php if (!$page): ?>
     <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
   <?php endif; ?>
-  <?php print render($title_suffix); ?>
+  <?php print $title_suffix; ?>
 
   <?php if ($display_submitted): ?>
     <div class="submitted">
@@ -95,16 +109,11 @@
   <?php endif; ?>
 
   <div class="content"<?php print $content_attributes; ?>>
-    <?php
-      // We hide the comments and links now so that we can render them later.
-      hide($content['comments']);
-      hide($content['links']);
-      print render($content);
-    ?>
+    <?php print $content; ?>
   </div>
 
-  <?php print render($content['links']); ?>
+  <?php print $links; ?>
 
-  <?php print render($content['comments']); ?>
+  <?php print $content_comments; ?>
 
 </div>