diff --git a/core/misc/states.js b/core/misc/states.js
index a2650a8165f..3c17efc9718 100644
--- a/core/misc/states.js
+++ b/core/misc/states.js
@@ -494,7 +494,7 @@ $(document).bind('state:disabled', function(e) {
     $(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
@@ -514,7 +514,7 @@ $(document).bind('state:required', function(e) {
 
 $(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/core/misc/tableselect.js b/core/misc/tableselect.js
index cc4beb0dc9d..5a88ac20ccc 100644
--- a/core/misc/tableselect.js
+++ b/core/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;
     });