diff --git a/core/includes/batch.inc b/core/includes/batch.inc
index 2152725..07f5ff6 100644
--- a/core/includes/batch.inc
+++ b/core/includes/batch.inc
@@ -375,10 +375,10 @@ function _batch_next_set() {
   if (isset($batch['sets'][$batch['current_set'] + 1])) {
     $batch['current_set']++;
     $current_set = &_batch_current_set();
-    if (isset($current_set['form_submit']) && ($function = $current_set['form_submit']) && function_exists($function)) {
+    if (isset($current_set['form_submit']) && ($function = $current_set['form_submit']) && is_callable($function)) {
       // We use our stored copies of $form and $form_state to account for
       // possible alterations by previous form submit handlers.
-      $function($batch['form_state']['complete_form'], $batch['form_state']);
+      call_user_func_array($function, array($batch['form_state']['complete_form'], &$batch['form_state']));
     }
     return TRUE;
   }
diff --git a/core/modules/user/lib/Drupal/user/Form/UserCancelForm.php b/core/modules/user/lib/Drupal/user/Form/UserCancelForm.php
index b917027..531aecc 100644
--- a/core/modules/user/lib/Drupal/user/Form/UserCancelForm.php
+++ b/core/modules/user/lib/Drupal/user/Form/UserCancelForm.php
@@ -7,13 +7,13 @@
 
 namespace Drupal\user\Form;
 
-use Drupal\Core\Entity\EntityConfirmFormBase;
+use Drupal\Core\Entity\EntityNGConfirmFormBase;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Provides a confirmation form for cancelling user account.
  */
-class UserCancelForm extends EntityConfirmFormBase {
+class UserCancelForm extends EntityNGConfirmFormBase {
 
   /**
    * Available account cancellation methods.
diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml
index a31f66b..a8d4ea1 100644
--- a/core/modules/user/user.routing.yml
+++ b/core/modules/user/user.routing.yml
@@ -76,11 +76,8 @@ user_role_delete:
     _entity_access: user_role.delete
 
 user_cancel_confirm:
-  pattern: '/user/{account}/cancel'
-  options:
-    converters:
-      account: 'user'
+  pattern: '/user/{user}/cancel'
   defaults:
     _entity_form: 'user.cancel'
   requirements:
-    _entity_access: account.delete
+    _entity_access: 'user.delete'