diff --git a/core/lib/Drupal/Core/Template/TwigEnvironment.php b/core/lib/Drupal/Core/Template/TwigEnvironment.php
index 26b2c97..89055cd 100644
--- a/core/lib/Drupal/Core/Template/TwigEnvironment.php
+++ b/core/lib/Drupal/Core/Template/TwigEnvironment.php
@@ -16,12 +16,12 @@
  * @see core\vendor\twig\twig\lib\Twig\Enviornment.php
  */
 class TwigEnvironment extends \Twig_Environment {
-  protected $cacheO = NULL;
+  protected $cache_object = NULL;
   protected $storage = NULL;
 
   public function __construct(\Twig_LoaderInterface $loader = NULL, $options = array()) {
     // @todo Pass as arguments from the DIC?
-    $this->cacheO = cache();
+    $this->cache_object = cache();
     $this->storage = drupal_php_storage('twig');
 
     parent::__construct($loader, $options);
@@ -44,20 +44,29 @@ public function loadTemplate($name, $index = NULL) {
     }
 
     if (!class_exists($cls, FALSE)) {
-      if (FALSE === $cache = $this->getCacheFilename($name)) {
-        eval('?' . '>' . $this->compileSource($this->loader->getSource($name), $name));
+      $cache_filename = $this->getCacheFilename($name);
+
+      if ($cache_filename === FALSE) {
+        $source = $this->loader->getSource($name);
+        $compiled_source = $this->compileSource($source, $name);
+        eval('?' . '>' . $compiled_source);
       } else {
-        $cid = 'twig:' . $cache;
-        $obj = $this->cacheO->get($cid);
+        $cid = 'twig:' . $cache_filename;
+        $obj = $this->cache_object->get($cid);
         $mtime = isset($obj->data) ? $obj->data : FALSE;
 
-        if (!$mtime || !$this->storage->exists($cache) || ($this->isAutoReload() && !$this->isTemplateFresh($name, $mtime))) {
-          $this->storage->save($cache, $this->compileSource($this->loader->getSource($name), $name));
+        // Check that the compiled template is cached and the storage exists.
+        // If autoreload is on, also check that the template has not been
+        // modified since the last compilation.
+        if (!$mtime || !$this->storage->exists($cache_filename) || ($this->isAutoReload() && !$this->isTemplateFresh($name, $mtime))) {
+          $source = $this->loader->getSource($name);
+          $compiled_source = $this->compileSource($source, $name);
+          $this->storage->save($cache_filename, $compiled_source);
           // Save the last modification time
-          $this->cacheO->set($cid, REQUEST_TIME);
+          $this->cache_object->set($cid, REQUEST_TIME);
         }
 
-        $this->storage->load($cache);
+        $this->storage->load($cache_filename);
       }
     }
 
diff --git a/core/lib/Drupal/Core/Template/TwigFactory.php b/core/lib/Drupal/Core/Template/TwigFactory.php
index a7a9e5e..550e1ec 100644
--- a/core/lib/Drupal/Core/Template/TwigFactory.php
+++ b/core/lib/Drupal/Core/Template/TwigFactory.php
@@ -46,7 +46,7 @@ public static function get() {
     $loader = new \Twig_Loader_Filesystem(DRUPAL_ROOT);
     $twig = new TwigEnvironment($loader, array(
         // This is saved / loaded via drupal_php_storage().
-        // All files can be refreshed via drush cc all.
+        // All files can be refreshed by clearing caches.
         // @todo ensure garbage collection of expired files.
         'cache' => TRUE,
         'base_template_class' => 'Drupal\Core\Template\TwigTemplate',
diff --git a/core/lib/Drupal/Core/Template/TwigReferenceFunctions.php b/core/lib/Drupal/Core/Template/TwigReferenceFunctions.php
index bb7ea1d..4f584d1 100644
--- a/core/lib/Drupal/Core/Template/TwigReferenceFunctions.php
+++ b/core/lib/Drupal/Core/Template/TwigReferenceFunctions.php
@@ -8,8 +8,7 @@
 namespace Drupal\Core\Template;
 
 /**
- * A class used as a helper to unwrap TwigReference objects and pass a
- * reference of the original variable to the called function.
+ * A helper used to unwrap TwigReference objects transparently.
  *
  * This is providing a static magic function that makes it easier to unwrap
  * TwigReference objects and pass variables by reference to show(), hide() and
diff --git a/core/modules/node/templates/node.twig b/core/modules/node/templates/node.twig
index 04bc96e..2d4a674 100644
--- a/core/modules/node/templates/node.twig
+++ b/core/modules/node/templates/node.twig
@@ -76,11 +76,11 @@
  * @ingroup themeable
  */
 #}
-<article id="node-{{ node.nid }}" class="{{ attributes.class }} clearfix" {{- attributes }}>
+<article id="node-{{ node.nid }}" class="{{ attributes.class }} clearfix"{{ attributes }}>
 
   {{ title_prefix }}
   {% if not page %}
-    <h2 {{- title_attributes }}>
+    <h2{{ title_attributes }}>
       <a href="{{ node_url }}" rel="bookmark">{{ label }}</a>
     </h2>
   {% endif %}
@@ -93,7 +93,7 @@
     </footer>
   {% endif %}
 
-  <div class="content" {{- content_attributes }}>
+  <div class="content"{{ content_attributes }}>
     {# We hide the comments and links now so that we can render them later. #}
     {% hide(content.comments) %}
     {% hide(content.links) %}