diff --git a/core/modules/comment/lib/Drupal/comment/CommentFormController.php b/core/modules/comment/lib/Drupal/comment/CommentFormController.php
index 4581707..cbe6bcd 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentFormController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentFormController.php
@@ -16,7 +16,7 @@ use Drupal\entity\EntityFormController;
 class CommentFormController extends EntityFormController {
 
   /**
-   * @see Drupal\entity\EntityFormController::form()
+   * Overrides Drupal\entity\EntityFormController::form().
    */
   protected function form(array $form, array &$form_state) {
     global $user;
@@ -194,7 +194,7 @@ class CommentFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::actions()
+   * Overrides Drupal\entity\EntityFormController::actions().
    */
   protected function actions(array $form, array &$form_state) {
     $element = parent::actions($form, $form_state);
@@ -222,7 +222,7 @@ class CommentFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::validate()
+   * Overrides Drupal\entity\EntityFormController::validate().
    */
   public function validate(array $form, array &$form_state) {
     parent::validate($form, $form_state);
@@ -259,7 +259,7 @@ class CommentFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::submit()
+   * Overrides Drupal\entity\EntityFormController::submit().
    */
   public function submit(array $form, array &$form_state) {
     $comment = parent::submit($form, $form_state);
@@ -323,7 +323,7 @@ class CommentFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::save()
+   * Overrides Drupal\entity\EntityFormController::save().
    */
   public function save(array $form, array &$form_state) {
     $node = node_load($form_state['values']['nid']);
diff --git a/core/modules/entity/lib/Drupal/entity/EntityFormController.php b/core/modules/entity/lib/Drupal/entity/EntityFormController.php
index 354711b..30bb2fe 100644
--- a/core/modules/entity/lib/Drupal/entity/EntityFormController.php
+++ b/core/modules/entity/lib/Drupal/entity/EntityFormController.php
@@ -278,9 +278,6 @@ class EntityFormController {
   /**
    * Returns the form entity.
    *
-   * @param $form_state
-   *   The current form state.
-   *
    * @return Drupal\entity\EntityInterface
    *   The entity being the current form entity.
    */
@@ -291,9 +288,7 @@ class EntityFormController {
   /**
    * Sets the form entity.
    *
-   * @param $form_state
-   *   The current form state.
-   * @param Drupal\entity\Entity $entity
+   * @param Drupal\entity\EntityInterface $entity
    *   The entity being edited in the current form.
    */
   protected function setEntity(EntityInterface $entity) {
@@ -329,7 +324,7 @@ class EntityFormController {
    * @param EntityFormController $controller
    *   The current entity form controller.
    */
-  protected static final function setFormInstance(&$form_state, $controller) {
+  protected static final function setFormInstance(&$form_state, EntityFormController $controller) {
     $controller->form_state = &$form_state;
     $form_state['controller'] = $controller;
   }
diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php
index eec6e29..dfd4d5a 100644
--- a/core/modules/node/lib/Drupal/node/NodeFormController.php
+++ b/core/modules/node/lib/Drupal/node/NodeFormController.php
@@ -21,7 +21,7 @@ class NodeFormController extends EntityFormController {
    * Fills in a few default values, and then invokes hook_prepare() on the node
    * type module, and hook_node_prepare() on all modules.
    *
-   * @see Drupal\entity\EntityFormController::prepareEntity()
+   * Overrides Drupal\entity\EntityFormController::prepareEntity().
    */
   protected function prepareEntity() {
     $node = $this->getEntity();
@@ -53,7 +53,7 @@ class NodeFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::form()
+   * Overrides Drupal\entity\EntityFormController::form().
    */
   protected function form(array $form, array &$form_state) {
     global $user;
@@ -262,7 +262,7 @@ class NodeFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::actions()
+   * Overrides Drupal\entity\EntityFormController::actions().
    */
   protected function actions(array $form, array &$form_state) {
     $element = parent::actions($form, $form_state);
@@ -282,7 +282,7 @@ class NodeFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::validate()
+   * Overrides Drupal\entity\EntityFormController::validate().
    */
   public function validate(array $form, array &$form_state) {
     // The entity form controller contains the actual entity being edited, but
@@ -331,7 +331,7 @@ class NodeFormController extends EntityFormController {
    * form state's entity with the current step's values before proceeding to the
    * next step.
    *
-   * @see Drupal\entity\EntityFormController::submit()
+   * Overrides Drupal\entity\EntityFormController::submit().
    */
   public function submit(array $form, array &$form_state) {
     $this->submitNodeLanguage($form, $form_state);
@@ -386,7 +386,7 @@ class NodeFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::save()
+   * Overrides Drupal\entity\EntityFormController::save().
    */
   public function save(array $form, array &$form_state) {
     $node = $this->getEntity();
@@ -422,7 +422,7 @@ class NodeFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::delete()
+   * Overrides Drupal\entity\EntityFormController::delete().
    */
   public function delete(array $form, array &$form_state) {
     $destination = array();
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
index 1ef5714..90c5c95 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
@@ -16,7 +16,7 @@ use Drupal\entity\EntityFormController;
 class TermFormController extends EntityFormController {
 
   /**
-   * @see Drupal\entity\EntityFormController::form()
+   * Overrides Drupal\entity\EntityFormController::form().
    */
   protected function form(array $form, array &$form_state) {
     $term = $this->getEntity();
@@ -117,7 +117,7 @@ class TermFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::validate()
+   * Overrides Drupal\entity\EntityFormController::validate().
    */
   public function validate(array $form, array &$form_state) {
     parent::validate($form, $form_state);
@@ -129,7 +129,7 @@ class TermFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::submit()
+   * Overrides Drupal\entity\EntityFormController::submit().
    */
   public function submit(array $form, array &$form_state) {
     $term = parent::submit($form, $form_state);
@@ -146,7 +146,7 @@ class TermFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::save()
+   * Overrides Drupal\entity\EntityFormController::save().
    */
   public function save(array $form, array &$form_state) {
     $term = $this->getEntity();
@@ -190,7 +190,7 @@ class TermFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::delete()
+   * Overrides Drupal\entity\EntityFormController::delete().
    */
   public function delete(array $form, array &$form_state) {
     $destination = array();
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
index cdba4b3..fb6f35a 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
@@ -16,7 +16,7 @@ use Drupal\entity\EntityFormController;
 class VocabularyFormController extends EntityFormController {
 
   /**
-   * @see Drupal\entity\EntityFormController::form()
+   * Overrides Drupal\entity\EntityFormController::form().
    */
   protected function form(array $form, array &$form_state) {
     $vocabulary = $this->getEntity();
@@ -68,7 +68,7 @@ class VocabularyFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::validate()
+   * Overrides Drupal\entity\EntityFormController::validate().
    */
   public function validate(array $form, array &$form_state) {
     parent::validate($form, $form_state);
@@ -88,7 +88,7 @@ class VocabularyFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::submit()
+   * Overrides Drupal\entity\EntityFormController::submit().
    */
   public function submit(array $form, array &$form_state) {
     // @todo We should not be calling taxonomy_vocabulary_confirm_delete() from
@@ -105,7 +105,7 @@ class VocabularyFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::save()
+   * Overrides Drupal\entity\EntityFormController::save().
    */
   public function save(array $form, array &$form_state) {
     $vocabulary = $this->getEntity();
diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index dadd1d8..93f5275 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -16,7 +16,7 @@ use Drupal\entity\EntityFormController;
 abstract class AccountFormController extends EntityFormController {
 
   /**
-   * @see Drupal\entity\EntityFormController::form()
+   * Overrides Drupal\entity\EntityFormController::form().
    */
   protected function form(array $form, array &$form_state) {
     global $user;
@@ -264,7 +264,7 @@ abstract class AccountFormController extends EntityFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::submit()
+   * Overrides Drupal\entity\EntityFormController::submit().
    */
   public function validate(array $form, array &$form_state) {
     parent::validate($form, $form_state);
diff --git a/core/modules/user/lib/Drupal/user/ProfileFormController.php b/core/modules/user/lib/Drupal/user/ProfileFormController.php
index 350f997..2e87f11 100644
--- a/core/modules/user/lib/Drupal/user/ProfileFormController.php
+++ b/core/modules/user/lib/Drupal/user/ProfileFormController.php
@@ -15,7 +15,7 @@ use Drupal\entity\EntityInterface;
 class ProfileFormController extends AccountFormController {
 
   /**
-   * @see Drupal\entity\EntityFormController::actions()
+   * Overrides Drupal\entity\EntityFormController::actions().
    */
   protected function actions(array $form, array &$form_state) {
     $element = parent::actions($form, $form_state);
@@ -36,7 +36,7 @@ class ProfileFormController extends AccountFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::submit()
+   * Overrides Drupal\entity\EntityFormController::submit().
    */
   public function submit(array $form, array &$form_state) {
     // @todo Consider moving this into the parent method.
@@ -46,7 +46,7 @@ class ProfileFormController extends AccountFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::save()
+   * Overrides Drupal\entity\EntityFormController::save().
    */
   public function save(array $form, array &$form_state) {
     $account = $this->getEntity();
diff --git a/core/modules/user/lib/Drupal/user/RegisterFormController.php b/core/modules/user/lib/Drupal/user/RegisterFormController.php
index 1a67911..458d9ca 100644
--- a/core/modules/user/lib/Drupal/user/RegisterFormController.php
+++ b/core/modules/user/lib/Drupal/user/RegisterFormController.php
@@ -15,7 +15,7 @@ use Drupal\entity\EntityInterface;
 class RegisterFormController extends AccountFormController {
 
   /**
-   * @see Drupal\entity\EntityFormController::form()
+   * Overrides Drupal\entity\EntityFormController::form().
    */
   protected function form(array $form, array &$form_state) {
     global $user;
@@ -62,7 +62,7 @@ class RegisterFormController extends AccountFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::actions()
+   * Overrides Drupal\entity\EntityFormController::actions().
    */
   protected function actions(array $form, array &$form_state) {
     $element = parent::actions($form, $form_state);
@@ -71,7 +71,7 @@ class RegisterFormController extends AccountFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::submit()
+   * Overrides Drupal\entity\EntityFormController::submit().
    */
   public function submit(array $form, array &$form_state) {
     $admin = $form_state['values']['administer_users'];
@@ -93,7 +93,7 @@ class RegisterFormController extends AccountFormController {
   }
 
   /**
-   * @see Drupal\entity\EntityFormController::submit()
+   * Overrides Drupal\entity\EntityFormController::submit().
    */
   public function save(array $form, array &$form_state) {
     $account = $this->getEntity();