diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 8741229..b395a8a 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -1092,18 +1092,19 @@ function template_preprocess_forum_list(&$variables) {
     // Cast num_posts and num_topics to strings to ensure the value can be
     // printed in the template because Twig with strict variables off will not
     // print int(0).
+    // @todo Remove the casting once http://drupal.org/node/1970960 is resolved.
     $variables['forums'][$id]->num_posts = (string) $variables['forums'][$id]->num_posts;
     $variables['forums'][$id]->num_topics = (string) $variables['forums'][$id]->num_topics;
   }
 
   $variables['pager'] = array(
    '#theme' => 'pager',
-   '#tags' => NULL,
   );
 
   // Cast forum_id to a string to ensure the value can be
   // printed in the template because Twig with strict variables off will not
   // print int(0).
+  // @todo Remove the casting once http://drupal.org/node/1970960 is resolved.
   // Give meaning to $tid for themers. $tid actually stands for term ID.
   $variables['forum_id'] = (string) $variables['tid'];
   unset($variables['tid']);
diff --git a/core/modules/forum/templates/forum-form.html.twig b/core/modules/forum/templates/forum-form.html.twig
index 614d0eb..4f60275 100644
--- a/core/modules/forum/templates/forum-form.html.twig
+++ b/core/modules/forum/templates/forum-form.html.twig
@@ -3,13 +3,9 @@
  * @see
  * Default theme implementation for a forum form.
  *
- * By default this does not alter the appearance of a form at all, but is
- * provided as a convenience for themers.
- *
  * Available variables:
- * - form: The complete form. Use {{ form }} to print the entire form, or print
- *   a subset such as {{ form.title }}. Use {% hide(form.description) %} to
- *   temporarily suppress the printing of a given element.
+ * - form: The complete form. Use 'form' to print the entire form, or print a
+ *   subset such as 'form.title'.
  *
  * @see template_preprocess()
  * @see template_preprocess_forum_form()