diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index d0aec1e..9540e8f 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1847,9 +1847,7 @@ function drupal_anonymous_user() {
   return (object) array(
     'uid' => 0,
     'hostname' => Drupal::request()->getClientIP(),
-    'roles' => array(
-      DRUPAL_ANONYMOUS_RID => DRUPAL_ANONYMOUS_RID,
-    ),
+    'roles' => array(DRUPAL_ANONYMOUS_RID),
   );
 }
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/PluginTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Plugin/PluginTestBase.php
index 57869c4..c580338 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Plugin/PluginTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Plugin/PluginTestBase.php
@@ -74,7 +74,7 @@ public function setUp() {
         'label' => 'User name',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserNameBlock',
         'context' => array(
-          'user' => array('class' => 'Drupal\user\\UserInterface')
+          'user' => array('class' => 'Drupal\user\UserInterface')
         ),
       ),
       'string_context' => array(
@@ -88,7 +88,7 @@ public function setUp() {
         'label' => 'Complex context',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockComplexContextBlock',
         'context' => array(
-          'user' => array('class' => 'Drupal\user\\UserInterface'),
+          'user' => array('class' => 'Drupal\user\UserInterface'),
           'node' => array('class' => 'Drupal\Core\Entity\EntityBCDecorator'),
         ),
       ),
diff --git a/core/modules/user/lib/Drupal/user/UserAccessController.php b/core/modules/user/lib/Drupal/user/UserAccessController.php
index dd7f230..2651933 100644
--- a/core/modules/user/lib/Drupal/user/UserAccessController.php
+++ b/core/modules/user/lib/Drupal/user/UserAccessController.php
@@ -32,14 +32,14 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, U
       case 'update':
         // Users can always edit their own account. Users with the 'administer
         // users' permission can edit any account except the anonymous account.
-        return (($account->uid == $entity->uid->value) || user_access('administer users', $account)) && $entity->uid->value > 0;
+        return (($account->uid == $entity->id()) || user_access('administer users', $account)) && $entity->id() > 0;
         break;
 
       case 'delete':
         // Users with 'cancel account' permission can cancel their own account,
         // users with 'administer users' permission can cancel any account
         // except the anonymous account.
-        return ((($account->uid == $entity->uid->value) && user_access('cancel account', $account)) || user_access('administer users', $account)) && $entity->uid->value > 0;
+        return ((($account->uid == $entity->id()) && user_access('cancel account', $account)) || user_access('administer users', $account)) && $entity->id() > 0;
         break;
     }
   }
@@ -51,9 +51,9 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, U
    */
   protected function viewAccess(EntityInterface $entity, $langcode, UserInterface $account) {
     // Never allow access to view the anonymous user account.
-    if ($entity->uid->value) {
+    if ($entity->id()) {
       // Admins can view all, users can view own profiles at all times.
-      if ($account->uid == $entity->uid->value || user_access('administer users', $account)) {
+      if ($account->uid == $entity->id() || user_access('administer users', $account)) {
         return TRUE;
       }
       elseif (user_access('access user profiles', $account)) {
diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php
index b1debbc..e3415f2 100644
--- a/core/modules/user/lib/Drupal/user/UserStorageController.php
+++ b/core/modules/user/lib/Drupal/user/UserStorageController.php
@@ -61,7 +61,7 @@ public function create(array $values) {
    * Overrides Drupal\Core\Entity\DatabaseStorageController::save().
    */
   public function save(EntityInterface $entity) {
-    if (!$entity->uid->value) {
+    if (!$entity->id()) {
       $entity->uid->value = db_next_id(db_query('SELECT MAX(uid) FROM {users}')->fetchField());
       $entity->enforceIsNew();
     }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 40a82b3..c555e50 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -2114,7 +2114,7 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
       $accounts = user_load_multiple($accounts);
       foreach ($accounts as $account) {
         // Skip adding the role to the user if they already have it.
-        if ($account !== FALSE && !array_search($rid, $account->roles)) {
+        if ($account !== FALSE && !in_array($rid, $account->roles)) {
           // For efficiency manually save the original account before applying
           // any changes.
           $account->original = clone $account;
@@ -2127,7 +2127,7 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
       $accounts = user_load_multiple($accounts);
       foreach ($accounts as $account) {
         // Skip removing the role from the user if they already don't have it.
-        if ($account !== FALSE && $index = array_search($rid, $account->roles)) {
+        if ($account !== FALSE && in_array($rid, $account->roles)) {
           $roles = array_diff($account->roles, array($rid));
           // For efficiency manually save the original account before applying
           // any changes.