diff --git a/reviewboard/templates/accounts/password_reset.html b/reviewboard/templates/accounts/password_reset.html
index a8a2af2dcd8f7a4ff4309b6a9b9fff19cd001db3..09ba8fa0caf7d08b17df4e0710c2e53d649eba2a 100644
--- a/reviewboard/templates/accounts/password_reset.html
+++ b/reviewboard/templates/accounts/password_reset.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load djblets_deco %}
-{% load i18n %}
+{% load djblets_deco i18n %}
 
 {% block title %}{% trans "Recover Password" %}{% endblock %}
 
diff --git a/reviewboard/templates/accounts/password_reset_complete.html b/reviewboard/templates/accounts/password_reset_complete.html
index dfeb5cffb05985daccd7269e6272f7e378c88447..1a5096bf1f556b6c82bc760411fef619a212924f 100644
--- a/reviewboard/templates/accounts/password_reset_complete.html
+++ b/reviewboard/templates/accounts/password_reset_complete.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load djblets_deco %}
-{% load i18n %}
+{% load djblets_deco i18n %}
 
 {% block title %}{% trans "Password reset complete" %}{% endblock %}
 
diff --git a/reviewboard/templates/accounts/password_reset_confirm.html b/reviewboard/templates/accounts/password_reset_confirm.html
index 24076868c89d08f42e378bff676ed521789eda34..e1ca77d745e459b924498f31683dd052933e7e54 100644
--- a/reviewboard/templates/accounts/password_reset_confirm.html
+++ b/reviewboard/templates/accounts/password_reset_confirm.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load djblets_deco %}
-{% load i18n %}
+{% load djblets_deco i18n %}
 
 {% block title %}{% trans "Recover Password" %}{% endblock %}
 
diff --git a/reviewboard/templates/accounts/password_reset_done.html b/reviewboard/templates/accounts/password_reset_done.html
index 34cd1eb3091f6197fffafb80ef651988d5b0a302..e72c1c46c3e1af2ce6caef04ce895996b972d6ba 100644
--- a/reviewboard/templates/accounts/password_reset_done.html
+++ b/reviewboard/templates/accounts/password_reset_done.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load djblets_deco %}
-{% load i18n %}
+{% load djblets_deco i18n %}
 
 {% block title %}{% trans "Password Reset Successful" %}{% endblock %}
 
diff --git a/reviewboard/templates/admin/admin_widget.html b/reviewboard/templates/admin/admin_widget.html
index 524c8b171f470b33f966fc71ca8e28b6f2f339b5..2ae011b9761644b1e644c88173563e4a89ee5b13 100644
--- a/reviewboard/templates/admin/admin_widget.html
+++ b/reviewboard/templates/admin/admin_widget.html
@@ -1,5 +1,5 @@
-{% load djblets_utils %}
-{% load staticfiles %}
+{% load djblets_utils staticfiles %}
+
 <div class="admin-widget widget-collapsable widget-{{widget.size}}{% if widget.collapsed %} widget-hidden %}{% endif %}{% if widget.actions %} widget-has-actions{% endif %}" id="{{widget.name}}">
  <h1 class="widget-heading">
 {% if widget.icon %}
diff --git a/reviewboard/templates/admin/base_site.html b/reviewboard/templates/admin/base_site.html
index 97f30c0b4ce32a16d8c79ad2e28be8943b505d6e..be03872ab783588f86d344ef80d804e38fe6afcd 100644
--- a/reviewboard/templates/admin/base_site.html
+++ b/reviewboard/templates/admin/base_site.html
@@ -1,9 +1,5 @@
 {% extends "base.html" %}
-{% load admin_static %}
-{% load compressed %}
-{% load i18n %}
-{% load rbadmintags %}
-{% load staticfiles %}
+{% load compressed i18n rbadmintags staticfiles %}
 
 {% block title %}{{title}} | {% trans "Administration" %}{% endblock %}
 
diff --git a/reviewboard/templates/admin/feed.html b/reviewboard/templates/admin/feed.html
index c9b6b1615cc902f19e6512fc928bf568f0bd3020..44c3818219a5df6aed9601fbab1874207f9925e1 100644
--- a/reviewboard/templates/admin/feed.html
+++ b/reviewboard/templates/admin/feed.html
@@ -1,5 +1,5 @@
-{% load feedtags %}
-{% load i18n %}
+{% load feedtags i18n %}
+
 {% if error %}
 {%  blocktrans with error.reason as error %}<p class="feed-error">Unable to load feed: {{error}}</p>{% endblocktrans %}
 {% else %}
@@ -8,4 +8,4 @@
  <h3 class="entry-title"><a href="{{entry.link}}">{{entry.title}}</a> {{entry.updated_parsed|feeddate|date:"M d, Y"}}</h3>
 </div>
 {%  endfor %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/reviewboard/templates/admin/manual_updates_required.html b/reviewboard/templates/admin/manual_updates_required.html
index c45acb2d5e516b7279f94b0ca32958a9bc0e3297..6c0dd1cf4f4c030950da5315773f1da8d328606d 100644
--- a/reviewboard/templates/admin/manual_updates_required.html
+++ b/reviewboard/templates/admin/manual_updates_required.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
-{% load djblets_deco %}
+{% load djblets_deco i18n %}
 
 {% block title %}{% trans "Manual server updates required" %}{% endblock %}
 {% block navbar %}{% endblock %}
diff --git a/reviewboard/templates/admin/repository_confirmations.html b/reviewboard/templates/admin/repository_confirmations.html
index 2e1463f55e40a1796d373bc1b08d909def05ad10..4b82c7a37c6fddd1334348f9b00e33e257de6a5a 100644
--- a/reviewboard/templates/admin/repository_confirmations.html
+++ b/reviewboard/templates/admin/repository_confirmations.html
@@ -1,5 +1,4 @@
-{% load djblets_utils %}
-{% load i18n %}
+{% load djblets_utils i18n %}
 
 <fieldset class="module confirmation" id="ssh-public-key-popup">
  <h2>{% trans "SSH Public Key:" %}</h2>
diff --git a/reviewboard/templates/admin/scmtools/repository/change_form.html b/reviewboard/templates/admin/scmtools/repository/change_form.html
index 6cb48b259210d470ab02d6137513e2414fbce6e4..5207f66389f7ecda69b41db91e3e8f06274a9cdb 100644
--- a/reviewboard/templates/admin/scmtools/repository/change_form.html
+++ b/reviewboard/templates/admin/scmtools/repository/change_form.html
@@ -1,6 +1,5 @@
 {% extends "admin/change_form.html" %}
-{% load compressed %}
-{% load i18n %}
+{% load compressed i18n %}
 
 {% block scripts %}
 {{block.super}}
diff --git a/reviewboard/templates/admin/settings.html b/reviewboard/templates/admin/settings.html
index d4046ce1fc75c6e2bff1e771955221e038ce39ee..788d7df8dd66b81ad8e24810f28d0f5632b39277 100644
--- a/reviewboard/templates/admin/settings.html
+++ b/reviewboard/templates/admin/settings.html
@@ -1,5 +1,3 @@
 {% extends "siteconfig/settings.html" %}
-{% load i18n %}
-{% load rbadmintags %}
 
 {% block subnavbar %}{% endblock %}
diff --git a/reviewboard/templates/admin/widgets/w-news.html b/reviewboard/templates/admin/widgets/w-news.html
index 8b80563ad4a4b81f121363f9d35857d587037537..541f8fe13067ef720f844f557ea140f838e97166 100644
--- a/reviewboard/templates/admin/widgets/w-news.html
+++ b/reviewboard/templates/admin/widgets/w-news.html
@@ -1,5 +1,5 @@
-{% load i18n %}
-{% load staticfiles %}
+{% load i18n staticfiles %}
+
 <div class="news-content-widget">
  <img src="{% static "rb/images/spinner.gif" %}"
       class="loading-indicator" width="16" height="16" border="0" alt="" />
diff --git a/reviewboard/templates/admin/widgets/w-recent-actions.html b/reviewboard/templates/admin/widgets/w-recent-actions.html
index 80aa978f76457e2285d2c46eb9552d3483f3a3b2..d6963e861dbfe645adfd3420b3da086c0f56202d 100644
--- a/reviewboard/templates/admin/widgets/w-recent-actions.html
+++ b/reviewboard/templates/admin/widgets/w-recent-actions.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load log %}
+{% load i18n log %}
 
 {% get_admin_log 5 as admin_log for_user user %}
 {% if not admin_log %}
diff --git a/reviewboard/templates/admin/widgets/w-repositories.html b/reviewboard/templates/admin/widgets/w-repositories.html
index ccda2d67ae564c6422eca83ea4e9e0c73af9b070..0cb9d3aff0a4d3cc317bfd384ddf03b7f31bed3c 100644
--- a/reviewboard/templates/admin/widgets/w-repositories.html
+++ b/reviewboard/templates/admin/widgets/w-repositories.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load staticfiles %}
+
 {% if widget.data.repositories %}
 <table class="widget-large-table">
  <thead>
diff --git a/reviewboard/templates/datagrids/group_permission_denied.html b/reviewboard/templates/datagrids/group_permission_denied.html
index 341eb58adb6b600bc3d7b8c4eebb5cb7257b38bb..df3c67eabbf042cf081023a5d11c9c0ff6f7c39f 100644
--- a/reviewboard/templates/datagrids/group_permission_denied.html
+++ b/reviewboard/templates/datagrids/group_permission_denied.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load djblets_deco %}
-{% load i18n %}
+{% load djblets_deco i18n %}
 
 {% block title %}{% trans "Permission Denied" %}{% endblock %}
 
diff --git a/reviewboard/templates/datagrids/review_request_listview.html b/reviewboard/templates/datagrids/review_request_listview.html
index b518893d9d0ad128ca51c256c5a5bc6f90e6b3ef..7c7ef1e315ecfe71f9477688e13fb70d9f96393d 100644
--- a/reviewboard/templates/datagrids/review_request_listview.html
+++ b/reviewboard/templates/datagrids/review_request_listview.html
@@ -1,6 +1,5 @@
 {% extends "datagrid/listview.html" %}
-{% load reviewtags %}
-{% load i18n %}
+{% load i18n reviewtags %}
 
 {% block datagrid_title %}
 {% if datagrid.group %}{% star datagrid.group %}{% endif %}
diff --git a/reviewboard/templates/diffviewer/diff_fragment_error.html b/reviewboard/templates/diffviewer/diff_fragment_error.html
index ac67f1939f93ab7add848d869adbffb632d79941..6bd55d71b7e4148882f7cbf0e2a869c270f3009f 100644
--- a/reviewboard/templates/diffviewer/diff_fragment_error.html
+++ b/reviewboard/templates/diffviewer/diff_fragment_error.html
@@ -1,5 +1,4 @@
-{% load djblets_utils %}
-{% load i18n %}
+{% load djblets_utils i18n %}
 
 <table class="sidebyside diff-error{% if file.newfile %} newfile{% endif %}"
        id="file{{file.filediff.id}}">
diff --git a/reviewboard/templates/notifications/email_diff_comment_fragment.html b/reviewboard/templates/notifications/email_diff_comment_fragment.html
index 92a28654bb9a5418038d09623ed7533129e27a92..84154c9387f95405b592de71c1eb725366324f50 100644
--- a/reviewboard/templates/notifications/email_diff_comment_fragment.html
+++ b/reviewboard/templates/notifications/email_diff_comment_fragment.html
@@ -1,6 +1,5 @@
-{% load djblets_utils %}
-{% load reviewtags %}
-{% load difftags %}
+{% load difftags djblets_utils reviewtags %}
+
 {% definevar "difflinecss" %}font-size: 8pt; line-height: 140%; margin: 0; {{precss}}{% enddefinevar %}
 <table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
  <thead>
diff --git a/reviewboard/templates/reviews/comment_issue.html b/reviewboard/templates/reviews/comment_issue.html
index a622368f6640c5390b02cb3dce08959a869bf612..4473a26cb1d78103d0a684690867fc5dfb1dbf1e 100644
--- a/reviewboard/templates/reviews/comment_issue.html
+++ b/reviewboard/templates/reviews/comment_issue.html
@@ -1,6 +1,4 @@
-{% load i18n %}
-{% load reviewtags %}
-{% load staticfiles %}
+{% load i18n reviewtags staticfiles %}
 
 <div class="issue-state"
      data-comment-id="{{comment.pk}}"
diff --git a/reviewboard/templates/reviews/diff_comment_fragment.html b/reviewboard/templates/reviews/diff_comment_fragment.html
index 9c8bb62e4f58528aeccc120ef8c447449579a071..77e860e761960b6de3656878b9ad54c6bdec2bd7 100644
--- a/reviewboard/templates/reviews/diff_comment_fragment.html
+++ b/reviewboard/templates/reviews/diff_comment_fragment.html
@@ -1,6 +1,5 @@
-{% load djblets_utils %}
-{% load reviewtags %}
-{% load difftags %}
+{% load difftags djblets_utils reviewtags %}
+
 <table class="sidebyside{% if comment.filediff.source_revision == PRE_CREATION %} newfile{% endif %}">
  <colgroup>
   <col class="line" />
diff --git a/reviewboard/templates/reviews/new_review_request.html b/reviewboard/templates/reviews/new_review_request.html
index cdf7f7792120131902802862c7028e29d91707d6..bcd4f5f8e0c1ba64fe8d56786a7f394c2c0f70a2 100644
--- a/reviewboard/templates/reviews/new_review_request.html
+++ b/reviewboard/templates/reviews/new_review_request.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
-{% load djblets_deco compressed %}
-{% load i18n %}
+{% load compressed djblets_deco i18n %}
+
 {% block title %}{% trans "New Review Request" %}{% endblock %}
 
 {% block css %}
diff --git a/reviewboard/templates/reviews/review_issue_summary_table.html b/reviewboard/templates/reviews/review_issue_summary_table.html
index 7a77691dcb7b1f87b8bf91f4230f58cc2d31c59c..8ca44eabdcfa750149844756413d3bb11f8e3931 100644
--- a/reviewboard/templates/reviews/review_issue_summary_table.html
+++ b/reviewboard/templates/reviews/review_issue_summary_table.html
@@ -1,6 +1,4 @@
-{% load djblets_utils %}
-{% load i18n %}
-{% load reviewtags %}
+{% load djblets_utils i18n reviewtags %}
 
 {% if issues.total > 0 %}
 <div class="content" id="issue-summary">
diff --git a/reviewboard/templates/reviews/review_reply_section.html b/reviewboard/templates/reviews/review_reply_section.html
index 399c6a68bac7500d93aee8e929e9078e90539b6d..49fc90530ee339d8249c35821013c1909d471fef 100644
--- a/reviewboard/templates/reviews/review_reply_section.html
+++ b/reviewboard/templates/reviews/review_reply_section.html
@@ -1,5 +1,5 @@
-{% load i18n %}
-{% load reviewtags %}
+{% load i18n reviewtags %}
+
   <div id="{{context_id}}-{{entry.review.id}}" class="comment-section" data-context-type="{{context_type}}"{% if comment %} data-context-id="{{comment.id}}"{% endif %}>
    <div class="issue-indicator"></div>
    <ol class="reply-comments">
diff --git a/reviewboard/templates/reviews/review_request_actions_secondary.html b/reviewboard/templates/reviews/review_request_actions_secondary.html
index feaf6c4016de8368093d3f5ed5fb136217aaeb32..b408fe2ba4ea94de34834bbc650f299cb4bb5b24 100644
--- a/reviewboard/templates/reviews/review_request_actions_secondary.html
+++ b/reviewboard/templates/reviews/review_request_actions_secondary.html
@@ -1,6 +1,4 @@
-{% load djblets_utils %}
-{% load i18n %}
-{% load staticfiles %}
+{% load djblets_utils i18n staticfiles %}
 
 {% if request.user.pk == review_request.submitter_id or perms.reviews.can_change_status and review_request.public %}
 {%  if review_request.status == 'P' %}
diff --git a/reviewboard/templates/reviews/review_request_dlgs.html b/reviewboard/templates/reviews/review_request_dlgs.html
index 84601fde0bbb76dc67e7fee7ccc1792a1b74fc60..c1a94261dea035917c71e89b802331f72a9370ff 100644
--- a/reviewboard/templates/reviews/review_request_dlgs.html
+++ b/reviewboard/templates/reviews/review_request_dlgs.html
@@ -1,6 +1,4 @@
-{% load djblets_js %}
-{% load djblets_utils %}
-{% load i18n %}
+{% load djblets_js djblets_utils i18n %}
 
 {% if request.user.pk == review_request.submitter_id or perms.reviews.can_edit_reviewrequest %}
 <script type="text/javascript">
diff --git a/reviewboard/templates/reviews/review_request_permission_denied.html b/reviewboard/templates/reviews/review_request_permission_denied.html
index 0de8c671a5b360cf22151566882d629de5c3231f..aac2dcfb5291060fa8a0ea8a42e91a2521c592df 100644
--- a/reviewboard/templates/reviews/review_request_permission_denied.html
+++ b/reviewboard/templates/reviews/review_request_permission_denied.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load djblets_deco %}
-{% load i18n %}
+{% load djblets_deco i18n %}
 
 {% block title %}{% trans "Permission Denied" %}{% endblock %}
 
diff --git a/reviewboard/templates/reviews/trophy_box.html b/reviewboard/templates/reviews/trophy_box.html
index 0d967a6a9e1080bf1f67757cf7cf435e5feb3b6b..8cea52966c0088998137177b76b0431ad3adc20b 100644
--- a/reviewboard/templates/reviews/trophy_box.html
+++ b/reviewboard/templates/reviews/trophy_box.html
@@ -1,8 +1,4 @@
-{% load djblets_deco %}
-{% load djblets_utils %}
-{% load i18n %}
-{% load reviewtags %}
-{% load staticfiles %}
+{% load djblets_deco djblets_utils i18n reviewtags staticfiles %}
 
 {% ifneatnumber review_request.display_id %}
 {%  box "yay" %}