diff --git a/core/themes/bartik/template.php b/core/themes/bartik/template.php
index 8d2b8c4..0cb7642 100644
--- a/core/themes/bartik/template.php
+++ b/core/themes/bartik/template.php
@@ -70,6 +70,29 @@ function bartik_process_page(&$variables) {
     // Make sure the shortcut link is the first item in title_suffix.
     $variables['title_suffix']['add_or_remove_shortcut']['#weight'] = -100;
   }
+
+  // Render all regions ahead of time, so simple variables can be used in the template file.
+  $variables['header'] = render($variables['page']['header']);
+  $variables['featured'] = render($variables['page']['featured']);
+  $variables['sidebar_first'] = render($variables['page']['sidebar_first']);
+  $variables['highlighted'] = render($variables['page']['highlighted']);
+  $variables['help'] = render($variables['page']['help']);
+  $variables['content'] = render($variables['page']['content']);
+  $variables['sidebar_second'] = render($variables['page']['sidebar_second']);
+  $variables['triptych_first'] = render($variables['page']['triptych_first']);
+  $variables['triptych_middle'] = render($variables['page']['triptych_middle']);
+  $variables['triptych_last'] = render($variables['page']['triptych_last']);
+  $variables['footer_firstcolumn'] = render($variables['page']['footer_firstcolumn']);
+  $variables['footer_secondcolumn'] = render($variables['page']['footer_secondcolumn']);
+  $variables['footer_thirdcolumn'] = render($variables['page']['footer_thirdcolumn']);
+  $variables['footer_fourthcolumn'] = render($variables['page']['footer_fourthcolumn']);
+  $variables['footer'] = render($variables['page']['footer']);
+
+  // Convert complex data structures into HTML variables for use in the template file.
+  $variables['tabs'] = render($variables['tabs']);
+  $variables['title_prefix'] = render($variables['title_prefix']);
+  $variables['title_suffix'] = render($variables['title_suffix']);
+  $variables['action_links'] = render($variables['action_links']);
 }
 
 /**
@@ -110,6 +133,54 @@ function bartik_preprocess_node(&$variables) {
 }
 
 /**
+ * Override or insert variables into the node template.
+ */
+function bartik_process_node(&$variables) {
+  // Remove the "Add new comment" link on the teaser page
+  // or if the comment form is being displayed on the same page.
+  if ($variables['teaser'] || !empty($variables['content']['comments']['comment_form'])) {
+    unset($variables['content']['links']['comment']['#links']['comment-add']);
+  }
+
+  // Render the content ahead of time, so simple variables can be used in the template file.
+  $variables['comments'] = render($variables['content']['comments']);
+  $variables['links'] = render($variables['content']['links']);
+  // Render the content after links and comments.
+  $variables['content'] = render($variables['content']);
+
+  // Convert complex data structures into HTML variables for use in the template file.
+  $variables['title_prefix'] = render($title_prefix);
+  $variables['title_suffix'] = render($title_suffix);
+}
+
+/**
+ * Override or insert variables into the comment wrapper template.
+ */
+function bartik_process_comment_wrapper(&$variables) {
+  // Render the content ahead of time, so simple variables can be used in the template file.
+  $variables['comments'] = render($variables['content']['comments']);
+  $variables['comment_form'] = render($variables['content']['comment_form']);
+
+  // Convert complex data structures into HTML variables for use in the template file.
+  $variables['title_prefix'] = render($title_prefix);
+  $variables['title_suffix'] = render($title_suffix);
+}
+
+/**
+ * Override or insert variables into the comment template.
+ */
+function bartik_process_comment(&$variables) {
+  // Render the content ahead of time, so simple variables can be used in the template file.
+  $variables['links'] = render($variables['content']['links']);
+  // Render the content after links.
+  $variables['content'] = render($variables['content']);
+
+  // Convert complex data structures into HTML variables for use in the template file.
+  $variables['title_prefix'] = render($title_prefix);
+  $variables['title_suffix'] = render($title_suffix);
+}
+
+/**
  * Override or insert variables into the block template.
  */
 function bartik_preprocess_block(&$variables) {
diff --git a/core/themes/bartik/templates/comment-wrapper.tpl.php b/core/themes/bartik/templates/comment-wrapper.tpl.php
index 864dc41..59f5db2 100644
--- a/core/themes/bartik/templates/comment-wrapper.tpl.php
+++ b/core/themes/bartik/templates/comment-wrapper.tpl.php
@@ -12,12 +12,10 @@
  *   CSS. It can be manipulated through the variable $classes_array from
  *   preprocess functions. The default value has the following:
  *   - comment-wrapper: The current template type, i.e., "theming hook".
- * - $title_prefix (array): An array containing additional output populated by
- *   modules, intended to be displayed in front of the main title tag that
- *   appears in the template.
- * - $title_suffix (array): An array containing additional output populated by
- *   modules, intended to be displayed after the main title tag that appears in
- *   the template.
+ * - $title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - $title_suffix: Additional output populated by modules, intended to be
+ *   displayed after the main title tag that appears in the template.
  *
  * The following variables are provided for contextual information.
  * - $node: Node object the comments are attached to.
@@ -32,20 +30,21 @@
  *   into a string within the variable $classes.
  *
  * @see template_preprocess_comment_wrapper()
+ * @see bartik_process_comment_wrapper()
  * @see theme_comment_wrapper()
  */
 ?>
 <div id="comments" class="<?php print $classes; ?>"<?php print $attributes; ?>>
-  <?php if ($content['comments'] && $node->type != 'forum'): ?>
-    <?php print render($title_prefix); ?>
+  <?php if ($comments && $node->type != 'forum'): ?>
+    <?php print $title_prefix; ?>
     <h2 class="title"><?php print t('Comments'); ?></h2>
-    <?php print render($title_suffix); ?>
+    <?php print $title_suffix; ?>
   <?php endif; ?>
 
-  <?php print render($content['comments']); ?>
+  <?php print $comments; ?>
 
-  <?php if ($content['comment_form']): ?>
+  <?php if ($comment_form): ?>
     <h2 class="title comment-form"><?php print t('Add new comment'); ?></h2>
-    <?php print render($content['comment_form']); ?>
+    <?php print $comment_form; ?>
   <?php endif; ?>
 </div>
diff --git a/core/themes/bartik/templates/comment.tpl.php b/core/themes/bartik/templates/comment.tpl.php
index d64487d..0427567 100644
--- a/core/themes/bartik/templates/comment.tpl.php
+++ b/core/themes/bartik/templates/comment.tpl.php
@@ -54,6 +54,7 @@
  * @see template_preprocess()
  * @see template_preprocess_comment()
  * @see template_process()
+ * @see bartik_process_comment()
  * @see theme_comment()
  */
 ?>
@@ -83,16 +84,14 @@
       <span class="new"><?php print $new; ?></span>
     <?php endif; ?>
 
-    <?php print render($title_prefix); ?>
+    <?php print $title_prefix; ?>
     <h3<?php print $title_attributes; ?>><?php print $title; ?></h3>
-    <?php print render($title_suffix); ?>
+    <?php print $title_suffix; ?>
 
     <div class="content"<?php print $content_attributes; ?>>
-      <?php
-        // We hide the comments and links now so that we can render them later.
-        hide($content['links']);
-        print render($content);
-      ?>
+
+      <?php print $content; ?>
+
       <?php if ($signature): ?>
       <div class="user-signature clearfix">
         <?php print $signature; ?>
@@ -100,6 +99,6 @@
       <?php endif; ?>
     </div> <!-- /.content -->
 
-    <?php print render($content['links']); ?>
+    <?php print $links; ?>
   </div> <!-- /.comment-text -->
 </div>
diff --git a/core/themes/bartik/templates/node.tpl.php b/core/themes/bartik/templates/node.tpl.php
index 234b899..5b37432 100644
--- a/core/themes/bartik/templates/node.tpl.php
+++ b/core/themes/bartik/templates/node.tpl.php
@@ -76,17 +76,19 @@
  * @see template_preprocess()
  * @see template_preprocess_node()
  * @see template_process()
+ * @see bartik_preprocess_node()
+ * @see bartik_process_node()
  */
 ?>
 <div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
 
-  <?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="meta submitted">
@@ -96,29 +98,15 @@
   <?php endif; ?>
 
   <div class="content clearfix"<?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
-    // Remove the "Add new comment" link on the teaser page or if the comment
-    // form is being displayed on the same page.
-    if ($teaser || !empty($content['comments']['comment_form'])) {
-      unset($content['links']['comment']['#links']['comment-add']);
-    }
-    // Only display the wrapper div if there are links.
-    $links = render($content['links']);
-    if ($links):
-  ?>
+  <?php if ($links): ?>
     <div class="link-wrapper">
       <?php print $links; ?>
     </div>
   <?php endif; ?>
 
-  <?php print render($content['comments']); ?>
+  <?php print $comments; ?>
 
 </div>
diff --git a/core/themes/bartik/templates/page.tpl.php b/core/themes/bartik/templates/page.tpl.php
index 7b0f990..c12fafd 100644
--- a/core/themes/bartik/templates/page.tpl.php
+++ b/core/themes/bartik/templates/page.tpl.php
@@ -43,18 +43,18 @@
  * - $breadcrumb: The breadcrumb trail for the current page.
  *
  * Page content (in order of occurrence in the default page.tpl.php):
- * - $title_prefix (array): An array containing additional output populated by
+ * - $title_prefix: Additional output populated by
  *   modules, intended to be displayed in front of the main title tag that
  *   appears in the template.
  * - $title: The page title, for use in the actual HTML content.
- * - $title_suffix (array): An array containing additional output populated by
+ * - $title_suffix: Additional output populated by
  *   modules, intended to be displayed after the main title tag that appears in
  *   the template.
  * - $messages: HTML for status and error messages. Should be displayed
  *   prominently.
- * - $tabs (array): Tabs linking to any sub-pages beneath the current page
+ * - $tabs: Tabs linking to any sub-pages beneath the current page
  *   (e.g., the view and edit tabs when displaying a node).
- * - $action_links (array): Actions local to the page, such as 'Add menu' on the
+ * - $action_links: Actions local to the page, such as 'Add menu' on the
  *   menu administration interface.
  * - $feed_icons: A string of all feed icons for the current page.
  * - $node: The node object, if there is an automatically-loaded node
@@ -63,20 +63,20 @@
  *   comment/reply/12345).
  *
  * Regions:
- * - $page['header']: Items for the header region.
- * - $page['featured']: Items for the featured region.
- * - $page['highlighted']: Items for the highlighted content region.
- * - $page['help']: Dynamic help text, mostly for admin pages.
- * - $page['content']: The main content of the current page.
- * - $page['sidebar_first']: Items for the first sidebar.
- * - $page['triptych_first']: Items for the first triptych.
- * - $page['triptych_middle']: Items for the middle triptych.
- * - $page['triptych_last']: Items for the last triptych.
- * - $page['footer_firstcolumn']: Items for the first footer column.
- * - $page['footer_secondcolumn']: Items for the second footer column.
- * - $page['footer_thirdcolumn']: Items for the third footer column.
- * - $page['footer_fourthcolumn']: Items for the fourth footer column.
- * - $page['footer']: Items for the footer region.
+ * - $header: Content for the header region.
+ * - $featured: Content for the featured region.
+ * - $highlighted: Content for the highlighted content region.
+ * - $help: Dynamic help text, mostly for admin pages.
+ * - $content: The main content of the current page.
+ * - $sidebar_first: Content for the first sidebar.
+ * - $triptych_first: Content for the first triptych.
+ * - $triptych_middle: Content for the middle triptych.
+ * - $triptych_last: Content for the last triptych.
+ * - $footer_firstcolumn: Content for the first footer column.
+ * - $footer_secondcolumn: Content for the second footer column.
+ * - $footer_thirdcolumn: Content for the third footer column.
+ * - $footer_fourthcolumn: Content for the fourth footer column.
+ * - $footer: Content for the footer region.
  *
  * @see template_preprocess()
  * @see template_preprocess_page()
@@ -120,7 +120,7 @@
       </div> <!-- /#name-and-slogan -->
     <?php endif; ?>
 
-    <?php print render($page['header']); ?>
+    <?php print $header; ?>
 
     <?php if ($main_menu): ?>
       <div id="main-menu" class="navigation">
@@ -164,9 +164,9 @@
     </div></div> <!-- /.section, /#messages -->
   <?php endif; ?>
 
-  <?php if ($page['featured']): ?>
+  <?php if ($featured): ?>
     <div id="featured"><div class="section clearfix">
-      <?php print render($page['featured']); ?>
+      <?php print $featured; ?>
     </div></div> <!-- /.section, /#featured -->
   <?php endif; ?>
 
@@ -176,41 +176,43 @@
       <div id="breadcrumb"><?php print $breadcrumb; ?></div>
     <?php endif; ?>
 
-    <?php if ($page['sidebar_first']): ?>
+    <?php if ($sidebar_first): ?>
       <div id="sidebar-first" class="column sidebar"><div class="section">
-        <?php print render($page['sidebar_first']); ?>
+        <?php print $sidebar_first; ?>
       </div></div> <!-- /.section, /#sidebar-first -->
     <?php endif; ?>
 
     <div id="content" class="column"><div class="section">
-      <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
+      <?php if ($highlighted): ?>
+        <div id="highlighted"><?php print $highlighted; ?></div>
+      <?php endif; ?>
       <a id="main-content"></a>
-      <?php print render($title_prefix); ?>
+      <?php print $title_prefix; ?>
       <?php if ($title): ?>
         <h1 class="title" id="page-title">
           <?php print $title; ?>
         </h1>
       <?php endif; ?>
-      <?php print render($title_suffix); ?>
+      <?php print $title_suffix; ?>
       <?php if ($tabs): ?>
         <div class="tabs">
-          <?php print render($tabs); ?>
+          <?php print $tabs; ?>
         </div>
       <?php endif; ?>
-      <?php print render($page['help']); ?>
+      <?php print $help; ?>
       <?php if ($action_links): ?>
         <ul class="action-links">
-          <?php print render($action_links); ?>
+          <?php print $action_links; ?>
         </ul>
       <?php endif; ?>
-      <?php print render($page['content']); ?>
+      <?php print $content; ?>
       <?php print $feed_icons; ?>
 
     </div></div> <!-- /.section, /#content -->
 
-    <?php if ($page['sidebar_second']): ?>
+    <?php if ($sidebar_second): ?>
       <div id="sidebar-second" class="column sidebar"><div class="section">
-        <?php print render($page['sidebar_second']); ?>
+        <?php print $sidebar_second; ?>
       </div></div> <!-- /.section, /#sidebar-second -->
     <?php endif; ?>
 
@@ -218,26 +220,26 @@
 
   <?php if ($page['triptych_first'] || $page['triptych_middle'] || $page['triptych_last']): ?>
     <div id="triptych-wrapper"><div id="triptych" class="clearfix">
-      <?php print render($page['triptych_first']); ?>
-      <?php print render($page['triptych_middle']); ?>
-      <?php print render($page['triptych_last']); ?>
+      <?php print $triptych_first; ?>
+      <?php print $triptych_middle; ?>
+      <?php print $triptych_last; ?>
     </div></div> <!-- /#triptych, /#triptych-wrapper -->
   <?php endif; ?>
 
   <div id="footer-wrapper"><div class="section">
 
-    <?php if ($page['footer_firstcolumn'] || $page['footer_secondcolumn'] || $page['footer_thirdcolumn'] || $page['footer_fourthcolumn']): ?>
+    <?php if ($footer_firstcolumn || $footer_secondcolumn || $footer_thirdcolumn || $footer_fourthcolumn): ?>
       <div id="footer-columns" class="clearfix">
-        <?php print render($page['footer_firstcolumn']); ?>
-        <?php print render($page['footer_secondcolumn']); ?>
-        <?php print render($page['footer_thirdcolumn']); ?>
-        <?php print render($page['footer_fourthcolumn']); ?>
+        <?php print $footer_firstcolumn; ?>
+        <?php print $footer_secondcolumn; ?>
+        <?php print $footer_thirdcolumn; ?>
+        <?php print $footer_fourthcolumn; ?>
       </div> <!-- /#footer-columns -->
     <?php endif; ?>
 
-    <?php if ($page['footer']): ?>
+    <?php if ($footer): ?>
       <div id="footer" class="clearfix">
-        <?php print render($page['footer']); ?>
+        <?php print $footer; ?>
       </div> <!-- /#footer -->
     <?php endif; ?>