diff --git a/upgrade_status.module b/upgrade_status.module
index 9b0f91a..355f0a5 100644
--- a/upgrade_status.module
+++ b/upgrade_status.module
@@ -258,30 +258,43 @@ function theme_upgrade_status_last_check($variables) {
 function upgrade_status_moved_into_core(&$projects, $project) {
   $core = TRUE;
   switch ($project) {
+
     case 'admin_language':
+    case 'entity_translation':
+    case 'fallback_language_negotiation':
+    case 'translation':
+    case 'i18n':
+    case 'i18n_views':
+    case 'l10n_install':
+    case 'l10n_update':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by core localization functionality, the core Language module, and the core Configuration, Content, and Interface Translation modules.');
       break;
 
     case 'admin_views':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Integrated with the core Views module.');
       break;
 
     case 'bean':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by the core Custom Block module.');
       break;
 
     case 'breakpoint':
     case 'breakpoints':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('Only the API, not the UI, for setting breakpoints was moved to the core "Breakpoint" module.');
       break;
 
     case 'cachetags':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by core APIs.');
       break;
 
     case 'caption_filter':
+    case 'float_filter':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by functionality in the core Editor module.');
       break;
 
     case 'ckeditor':
@@ -290,121 +303,93 @@ function upgrade_status_moved_into_core(&$projects, $project) {
 
     case 'ctools':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('Much of this module was moved into core, including modal dialogs, exportables, and plugins. Page Manager and Form Wizard are the biggest outstanding omissions.');
+      $projects[$project]['in_core_note'] = t('Mostly replaced by core APIs, including modal dialogs, exportables, and plugins. Excludes <a href="@url">Page Manager</a> and Form Wizard.', array('@url' => 'https://www.drupal.org/project/page_manager'));
       break;
 
     case 'date':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('Not including recurring dates support.');
+      $projects[$project]['in_core_note'] = t('Without recurring dates support or integrated start and end dates.');
       break;
 
     case 'edit':
+    case 'quickedit':
       $projects[$project]['in_core_since'] = '8.x';
       break;
 
     case 'email':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('Simple text field with HTML5 validation only.'); 
-      break;
-
-    case 'entity':
-      $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('E-mail address contact forms are not supported by core.');
       break;
 
     case 'entityreference':
       $projects[$project]['in_core_since'] = '8.x';
       break;
 
-    case 'entity_translation':
-    case 'translation':
-      $projects[$project]['in_core_since'] = '8.x';
-      break;
-
+    case 'entity':
     case 'entity_view_mode':
-      $projects[$project]['in_core_since'] = '8.x';
-      break;
-
-    case 'fallback_language_negotiation':
-      $projects[$project]['in_core_since'] = '8.x';
-      break;
-
     case 'file_entity':
-      $projects[$project]['in_core_since'] = '8.x';
-      break;
-
-    case 'float_filter':
-      $projects[$project]['in_core_since'] = '8.x';
-      break;
-
     case 'hidden_field':
+    case 'title':
+    case 'user_picture_field':
+    case 'uuid':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by core Entity system functionality.');
       break;
 
-    case 'i18n':
-      $projects[$project]['in_core_since'] = '8.x';
-      break;
-
-    case 'l10n_install':
-    case 'l10n_update':
+    case 'features':
       $projects[$project]['in_core_since'] = '8.x';
-      break;
+      $projects[$project]['in_core_note'] = t('The original intended functionality of the Features module is not provided by core, but the core Configuration system provides support for importing, exporting, and overriding site configuration.');
 
     case 'link':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('Simple text field with HTML5 validation only.');
+      $projects[$project]['in_core_note'] = t('Without support for internal links.');
       break;
 
     case 'migrate':
     case 'migrate_d2d':
+    case 'migrate_drupal':
       $projects[$project]['in_core_since'] = '8.x';
       break;
 
     case 'module_filter':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('The original use case for the module, anyway. The re-designed modules page in the 2.x branch is not in core.'); 
+      $projects[$project]['in_core_note'] = t('A search functionality is included on the core modules page. The re-designed modules page in the 2.x branch is not in core.');
       break;
 
     case 'navbar':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by the updated core Toolbar module.');
       break;
 
     case 'phone':
     case 'telephone':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('Simple text field with HTML5 validation only.'); 
       break;
 
     case 'picture':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by the core Responsive Image module.');
       break;
 
+    case 'elements':
     case 'placeholder':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by HTML5 form API functionality.');
       break;
 
     case 'restws':
       $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by the core REST module.');
       break;
 
     case 'services':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('The new REST module covers most of the ground of the old Services module.');
-      break;
-
-    case 'title':
-      $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('The new REST module covers most of the ground of the old Services module.');
       break;
 
     case 'transliteration':
       $projects[$project]['in_core_since'] = '8.x';
-      break;
-
-    case 'user_picture_field':
-      $projects[$project]['in_core_since'] = '8.x';
-      break;
-
-    case 'uuid':
-      $projects[$project]['in_core_since'] = '8.x';
+      $projects[$project]['in_core_note'] = t('Replaced by core APIs.');
       break;
 
     case 'views':
@@ -413,44 +398,24 @@ function upgrade_status_moved_into_core(&$projects, $project) {
 
     case 'views_bulk_operations':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('Bulk operations on simple actions only. No support for batch operations or configurable actions.'); 
+      $projects[$project]['in_core_note'] = t('The core Views module provides bulk operations on simple actions only. No support for batch operations or configurable actions.');
       break;
 
     case 'wysiwyg':
       $projects[$project]['in_core_since'] = '8.x';
-      $projects[$project]['help'] = t('API support added to the core "Editor" module. No support for multiple text editors per text format.'); 
-      break;
-
-    case 'ahah_helper':
-      $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('Allows Drupal modules to implement AHAH/AJAX functionality without touching JavaScript. Entirely covered by the new AJAX framework in Drupal 7, which is based on <a href="@ctools-url">CTools</a>.', array(
-        '@ctools-url' => 'http://drupal.org/project/ctools',
-      ));
-      break;
-
-    case 'autoload':
-      $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('Allows Drupal modules to lazy-load any class that has not been loaded yet. A major performance improvement in Drupal 7, and the only part of the <a href="@issue-url">Registry</a> that was introduced earlier, but later removed from Drupal 7.', array(
-        '@issue-url' => 'http://drupal.org/node/221964',
-      ));
+      $projects[$project]['in_core_note'] = t('API support added to the core "Editor" module. No support for multiple text editors per text format.');
       break;
 
-    case 'auto_menutitle':
-    case 'automaticmenu':
-    case 'automenu':
-      $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('When creating new content, Drupal 7 automatically takes over the title of the content as menu link title, while still allowing you to alter it.');
-      break;
     case 'ahah_helper':
       $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('Allows Drupal modules to implement AHAH/AJAX functionality without touching JavaScript. Entirely covered by the new AJAX framework in Drupal 7, which is based on <a href="@ctools-url">CTools</a>.', array(
+      $projects[$project]['in_core_note'] = t('Allows Drupal modules to implement AHAH/AJAX functionality without touching JavaScript. Entirely covered by the new AJAX framework in Drupal 7, which is based on <a href="@ctools-url">CTools</a>.', array(
         '@ctools-url' => 'http://drupal.org/project/ctools',
       ));
       break;
 
     case 'autoload':
       $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('Allows Drupal modules to lazy-load any class that has not been loaded yet. A major performance improvement in Drupal 7, and the only part of the <a href="@issue-url">Registry</a> that was introduced earlier, but later removed from Drupal 7.', array(
+      $projects[$project]['in_core_note'] = t('Allows Drupal modules to lazy-load any class that has not been loaded yet. A major performance improvement in Drupal 7, and the only part of the <a href="@issue-url">Registry</a> that was introduced earlier, but later removed from Drupal 7.', array(
         '@issue-url' => 'http://drupal.org/node/221964',
       ));
       break;
@@ -459,21 +424,21 @@ function upgrade_status_moved_into_core(&$projects, $project) {
     case 'automaticmenu':
     case 'automenu':
       $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('When creating new content, Drupal 7 automatically takes over the title of the content as menu link title, while still allowing you to alter it.');
+      $projects[$project]['in_core_note'] = t('When creating new content, Drupal 7 automatically takes over the title of the content as menu link title, while still allowing you to alter it.');
       break;
 
     case 'admin_hover':
     case 'block_edit':
     case 'contextual':
       $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('The new <a href="@issue-url">Contextual links</a> module in Drupal 7 allows you to manage page elements from the page you are looking at, i.e., you have direct access to "Edit" and "Delete" pages for content, or "Configure" pages for blocks, "List links" for menu blocks, etc. Every module can integrate with Contextual module.', array(
+      $projects[$project]['in_core_note'] = t('The new <a href="@issue-url">Contextual links</a> module in Drupal 7 allows you to manage page elements from the page you are looking at, i.e., you have direct access to "Edit" and "Delete" pages for content, or "Configure" pages for blocks, "List links" for menu blocks, etc. Every module can integrate with Contextual module.', array(
         '@issue-url' => 'http://drupal.org/node/473268',
       ));
       break;
 
     case 'adminrole':
       $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('The <a href="@issue-url">administration role</a> is based on regular Drupal user roles and every user role can be configured to be the administration role. All new permissions (and only new) are automatically granted to the configured administration role. Permissions can still be removed from the role.', array(
+      $projects[$project]['in_core_note'] = t('The <a href="@issue-url">administration role</a> is based on regular Drupal user roles and every user role can be configured to be the administration role. All new permissions (and only new) are automatically granted to the configured administration role. Permissions can still be removed from the role.', array(
         '@issue-url' => 'http://drupal.org/node/480660',
       ));
       break;
@@ -533,7 +498,7 @@ function upgrade_status_moved_into_core(&$projects, $project) {
     case 'dbtng':
     case 'transaction':
       $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('Drupal 7 implements an entirely new <a href="@issue-url">database layer</a>, which allows Drupal to work with any database. Modules are able to alter most database queries and there is support for transactions.', array(
+      $projects[$project]['in_core_note'] = t('Drupal 7 implements an entirely new <a href="@issue-url">database layer</a>, which allows Drupal to work with any database. Modules are able to alter most database queries and there is support for transactions.', array(
         '@issue-url' => 'http://drupal.org/node/225450',
       ));
       break;
@@ -546,13 +511,13 @@ function upgrade_status_moved_into_core(&$projects, $project) {
     case 'elements':
     case 'element_themehook':
       $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('In Drupal 7, almost all content is generated as "renderable array", which allows to consider any element on a page as atomic, alterable, and themeable element that can be still be altered until it is rendered into a string.');
+      $projects[$project]['in_core_note'] = t('In Drupal 7, almost all content is generated as "renderable array", which allows to consider any element on a page as atomic, alterable, and themeable element that can be still be altered until it is rendered into a string.');
       break;
 
     case 'hook_file':
     case 'storage_api':
       $projects[$project]['in_core_since'] = '7.x';
-      $projects[$project]['help'] = t('Drupal 7 natively uses PHP 5 stream wrappers, which allow to store and access files in almost any location, even remotely. There is also a clean separation between the public and private filesystem, and both can be used at the same time.');
+      $projects[$project]['in_core_note'] = t('Drupal 7 natively uses PHP 5 stream wrappers, which allow to store and access files in almost any location, even remotely. There is also a clean separation between the public and private filesystem, and both can be used at the same time.');
       break;
 
     case 'filefield':
