diff --git a/core/modules/node/content_types.inc b/core/modules/node/content_types.inc
index 055050e..7388ee9 100644
--- a/core/modules/node/content_types.inc
+++ b/core/modules/node/content_types.inc
@@ -8,7 +8,7 @@
 /**
  * Page callback: Displays the content type admin overview page.
  *
- * @return
+ * @return array
  *   An array as expected by drupal_render().
  *
  * @see node_menu()
@@ -66,7 +66,7 @@ function node_overview_types() {
  *   - type: An object containing the 'type' (machine name) and 'description' of
  *     the content type.
  *
- * @return
+ * @return string
  *   An HTML-formatted string of the description for this node type.
  *
  * @ingroup themeable
@@ -285,10 +285,10 @@ function node_type_form($form, &$form_state, $type = NULL) {
 /**
  * Helper function for teaser length choices.
  *
- * @param $length
+ * @param int $length
  *   An integer representing the desired length of the teaser string.
  *
- * @return
+ * @return string
  *   A string that reprents the teaser length options.
  */
 function _node_characters($length) {
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index b06cb1b..d3e8b6d 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -10,7 +10,7 @@ use Drupal\Core\Database\Query\SelectInterface;
 /**
  * Page callback: Form constructor for the permission rebuild confirmation form.
  *
- * @return
+ * @return array
  *   An array as expected by drupal_render().
  *
  * @see node_configure_rebuild_confirm_submit()
@@ -314,7 +314,7 @@ function node_mass_update($nodes, $updates) {
  * @param $updates
  *   Associative array of updates.
  *
- * @return
+ * @return object
  *   An updated node object.
  *
  * @see node_mass_update()
@@ -333,11 +333,11 @@ function _node_mass_update_helper($nid, $updates) {
 /**
  * Executes a batch operation for node_mass_update().
  *
- * @param $nodes
+ * @param array $nodes
  *   An array of node IDs.
- * @param $updates
+ * @param array $updates
  *   Associative array of updates.
- * @param $context
+ * @param array $context
  *   An array of contextual key/values.
  */
 function _node_mass_update_batch_process($nodes, $updates, &$context) {
@@ -371,12 +371,12 @@ function _node_mass_update_batch_process($nodes, $updates, &$context) {
 /**
  * Reports the 'finished' status of batch operation for node_mass_update().
  *
- * @param $success
+ * @param bool $success
  *   A boolean indicating whether the batch mass update operation successfully
  *   concluded.
- * @param $results
+ * @param int $results
  *   The number of nodes updated via the batch mode process.
- * @param $operations
+ * @param array $operations
  *   An array of function calls (not used in this function).
  */
 function _node_mass_update_batch_finished($success, $results, $operations) {
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 21ce0b2..5b54af5 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -363,10 +363,10 @@ function node_tag_new(Node $node) {
 /**
  * Retrieves the timestamp for the current user's last view of a specified node.
  *
- * @param $nid
+ * @param int $nid
  *   A node ID.
  *
- * @return
+ * @return int
  *   If a node has been previously viewed by the user, the timestamp in seconds
  *   of when the last view occurred; otherwise, zero.
  */
@@ -797,7 +797,7 @@ function node_type_update_nodes($old_type, $type) {
  *
  * @param $rebuild
  *  (optional) TRUE to rebuild node types. Equivalent to calling
- *  node_types_rebuild().  Defaults to FALSE.
+ *  node_types_rebuild(). Defaults to FALSE.
  *
  * @return
  *   An object with two properties:
@@ -1081,10 +1081,10 @@ function node_revision_load($vid = NULL) {
 /**
  * Prepares a node for saving by populating the author and creation date.
  *
- * @param $node
+ * @param object $node
  *   A node object.
  *
- * @return
+ * @return object
  *   An updated node object.
  */
 function node_submit($node) {
@@ -2075,7 +2075,7 @@ function node_menu_local_tasks_alter(&$data, $router_item, $root_path) {
  * @param $type
  *   The node type object.
  *
- * @return
+ * @return string
  *   An unsanitized string that is the title of the node type edit form.
  *
  * @see node_menu()
@@ -2582,7 +2582,7 @@ function node_view_multiple($nodes, $view_mode = 'teaser', $weight = 0, $langcod
 /**
  * Page callback: Generates a listing of promoted nodes.
  *
- * @return
+ * @return array
  *   An array in the format expected by drupal_render().
  *
  * @see node_menu()
@@ -3201,7 +3201,7 @@ function node_access_grants($op, $account = NULL) {
  *
  * @param $account
  *   (optional) The user object for the user whose access is being checked. If
- *   omitted, the current user is used.Defaults to NULL.
+ *   omitted, the current user is used. Defaults to NULL.
  *
  * @return
  *   TRUE if 'view' access to all nodes is granted, FALSE otherwise.
@@ -3287,11 +3287,6 @@ function node_query_entity_field_access_alter(AlterableInterface $query) {
  *   node_query_node_access_alter() and node_query_entity_field_access_alter()
  *   for more.
  *
- * @return
- *   Returns NULL if the user can bypass node access, or if there are no node
- *   access modules, or if the $account has a global view grant in a view
- *   operation; otherwise, does not return a value.
- *
  * @see node_query_node_access_alter()
  * @see node_query_entity_field_access_alter()
  */
@@ -3614,7 +3609,7 @@ function node_access_rebuild($batch_mode = FALSE) {
  * The batch processing engine interrupts processing and sends progress
  * feedback after 1 second execution time.
  *
- * @param $context
+ * @param array $context
  *   An array of contextual key/value information for rebuild batch process.
  */
 function _node_access_rebuild_batch_operation(&$context) {
@@ -3648,11 +3643,11 @@ function _node_access_rebuild_batch_operation(&$context) {
 /**
  * Post-processing for node_access_rebuild_batch.
  *
- * @param $success
+ * @param bool $success
  *   A boolean indicating whether the re-build process has completed.
- * @param $results
+ * @param array $results
  *   An array of results information.
- * @param $operations
+ * @param array $operations
  *   An array of function calls (not used in this function).
  */
 function _node_access_rebuild_batch_finished($success, $results, $operations) {
@@ -3978,10 +3973,10 @@ function node_assign_owner_action_submit($form, $form_state) {
 /**
  * Generates settings form for node_unpublish_by_keyword_action().
  *
- * @param $context
+ * @param array $context
  *   Array of additional information about what triggered this action.
  *
- * @return
+ * @return array
  *   A form array.
  */
 function node_unpublish_by_keyword_action_form($context) {
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index c671875..1780fb9 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -14,10 +14,10 @@ use Drupal\node\Node;
 /**
  * Page callback: Presents the node editing form.
  *
- * @param $node
+ * @param object $node
  *   A node object.
  *
- * @return
+ * @return array
  *   A form array as expected by drupal_render().
  *
  * @see node_menu()
@@ -32,7 +32,7 @@ function node_page_edit($node) {
  *
  * Redirects to node/add/[type] if only one content type is available.
  *
- * @return
+ * @return array
  *   A render array for a list of the node types that can be added; however, if
  *   there is only one node type defined for the site, the function redirects
  *   to the node add page for that one node type and does not return at all.
@@ -62,7 +62,7 @@ function node_add_page() {
  *   An associative array containing:
  *   - content: An array of content types.
  *
- * @return
+ * @return string
  *   An HTML-formatted string.
  *
  * @see node_add_page()
@@ -94,7 +94,7 @@ function theme_node_add_list($variables) {
  * @param $node_type
  *   The node type object for the submitted node.
  *
- * @return
+ * @return array
  *   A node submission form.
  *
  * @see node_menu()
@@ -203,10 +203,10 @@ function theme_node_preview($variables) {
 /**
  * Page callback: Form constructor for node deletion confirmation form.
  *
- * @param $node
+ * @param object $node
  *   A node object.
  *
- * @return
+ * @return array
  *   A form array.
  *
  * @see node_menu()
@@ -240,10 +240,10 @@ function node_delete_confirm_submit($form, &$form_state) {
 /**
  * Page callback: Generates an overview table of older revisions of a node.
  *
- * @param $node
+ * @param object $node
  *   A node object.
  *
- * @return
+ * @return array
  *   An array as expected by drupal_render().
  *
  * @see node_menu()
@@ -304,10 +304,10 @@ function node_revision_overview($node) {
  *
  * This form prevents against CSRF attacks.
  *
- * @param $node_revision
+ * @param int $node_revision
  *   The node revision ID.
  *
- * @return
+ * @return array
  *   An array as expected by drupal_render().
  *
  * @see node_menu()