diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 41c6eb0..7898d6e 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -199,8 +199,6 @@ function drupal_get_filename($type, $name, $filename = NULL) {
   }
 
   // Profiles are converted into modules in system_rebuild_module_data().
-  // @todo Remove false-exposure of profiles as modules.
-  $original_type = $type;
   if ($type == 'profile') {
     $type = 'module';
   }
@@ -248,7 +246,7 @@ function drupal_get_filename($type, $name, $filename = NULL) {
  *   The name of the item for which the path is requested. Ignored for
  *   $type 'core'.
  *
- * @return
+ * @return string
  *   The path to the requested item or an empty string if the item is not found.
  */
 function drupal_get_path($type, $name) {
@@ -304,7 +302,7 @@ function drupal_get_path($type, $name) {
  *   - 'context' (defaults to the empty context): The context the source string
  *     belongs to.
  *
- * @return
+ * @return \Drupal\Core\StringTranslation\TranslatableMarkup
  *   The translated string.
  *
  * @see \Drupal\Component\Utility\SafeMarkup::format()
@@ -349,7 +347,7 @@ function format_string($string, array $args) {
  * @param $text
  *   The text to check.
  *
- * @return
+ * @return bool
  *   TRUE if the text is valid UTF-8, FALSE if not.
  *
  * @see \Drupal\Component\Utility\Unicode::validateUtf8()
@@ -953,7 +951,7 @@ function drupal_placeholder($text) {
  * @param ...
  *   Additional arguments to pass to the shutdown function.
  *
- * @return
+ * @return array
  *   Array of shutdown functions to be executed.
  *
  * @see register_shutdown_function()