diff --git a/misc/states.js b/misc/states.js
index 9b98d5dd292b3085f3a35f41597c26f3064728d1..3597ae8f9d0ed8f387bd3fd67c9fc0880e9af4f8 100644
--- a/misc/states.js
+++ b/misc/states.js
@@ -360,7 +360,7 @@ states.State.prototype = {
       $(e.target)
         .attr('disabled', e.value)
         .filter('.form-element')
-          .closest('.form-item, .form-submit, .form-wrapper')[e.value ? 'addClass' : 'removeClass']('form-disabled');
+          .closest('.form-item, .form-submit, .form-wrapper').toggleClass('form-disabled', e.value);
 
       // Note: WebKit nightlies don't reflect that change correctly.
       // See https://bugs.webkit.org/show_bug.cgi?id=23789
@@ -380,7 +380,7 @@ states.State.prototype = {
 
   $(document).bind('state:visible', function(e) {
     if (e.trigger) {
-      $(e.target).closest('.form-item, .form-submit, .form-wrapper')[e.value ? 'show' : 'hide']();
+      $(e.target).closest('.form-item, .form-submit, .form-wrapper').toggle(e.value);
     }
   });
 
diff --git a/misc/tableselect.js b/misc/tableselect.js
index f201a88b010680ff015a5bad947bd63be27d1fe6..60b4921977fd9de031c2ff41677372799f7801f1 100644
--- a/misc/tableselect.js
+++ b/misc/tableselect.js
@@ -70,7 +70,7 @@ Drupal.tableSelectRange = function (from, to, state) {
     }
 
     // Either add or remove the selected class based on the state of the target checkbox.
-    $(i)[ state ? 'addClass' : 'removeClass' ]('selected');
+    $(i).toggleClass('selected', state);
     $('input:checkbox', i).each(function () {
       this.checked = state;
     });