diff --git a/core/includes/file.inc b/core/includes/file.inc
index 133d64f..8e51452 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -2458,7 +2458,7 @@ function file_directory_temp() {
  *
  * @return
  *   An associative array of headers, as expected by
- *   \Symfony\Component\HttpFoundation\StreamedResponse.
+ *   Symfony\Component\HttpFoundation\StreamedResponse.
  */
 function file_get_content_headers(File $file) {
   $name = mime_header_encode($file->filename);
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 7361a82..4263ab1 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -27,7 +27,7 @@ use Drupal\Core\EventSubscriber\RouterListener;
 class DrupalKernel extends HttpKernel {
 
     /**
-     * Constructor.
+     * Constructs a Drupal\Core\DrupalKernel object.
      *
      * @param Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
      *   An EventDispatcherInterface instance.
diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index daed1c9..5f511c9 100644
--- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -18,7 +18,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 class MaintenanceModeSubscriber implements EventSubscriberInterface {
 
   /**
-   * Response with the maintenance page when the site is offline.
+   * Responds with the maintenance page when the site is offline.
    *
    * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event
    *   The Event to process.
diff --git a/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php b/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php
index fd0a765..7d09670 100644
--- a/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php
+++ b/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php
@@ -14,11 +14,28 @@ use Symfony\Component\HttpFoundation\Request;
  */
 abstract class PathListenerBase {
 
+  /**
+   * Extracts the path from a request object.
+   *
+   * @param Symfony\Component\HttpFoundation\Request $request
+   *   The request to extract the path from.
+   *
+   * @return string
+   *   The path without leading or trailing slashes.
+   */
   public function extractPath(Request $request) {
     $path = $request->attributes->get('system_path');
     return isset($path) ? $path : trim($request->getPathInfo(), '/');
   }
 
+  /**
+   * Sets a new path.
+   *
+   * @param Symfony\Component\HttpFoundation\Request $request
+   *   The request to set a new path on.
+   * @param string $path
+   *   The path to set.
+   */
   public function setPath(Request $request, $path) {
     $request->attributes->set('system_path', $path);
 
diff --git a/core/lib/Drupal/Core/EventSubscriber/RouterListener.php b/core/lib/Drupal/Core/EventSubscriber/RouterListener.php
index 7b158fd..b7d6435 100644
--- a/core/lib/Drupal/Core/EventSubscriber/RouterListener.php
+++ b/core/lib/Drupal/Core/EventSubscriber/RouterListener.php
@@ -41,6 +41,9 @@ class RouterListener extends SymfonyRouterListener {
    */
   protected $logger;
 
+  /**
+   * Constructs a Drupal\Core\EventSubscriber\RouterListener object.
+   */
   public function __construct(UrlMatcherInterface $urlMatcher, LoggerInterface $logger = null) {
     parent::__construct($urlMatcher, $logger);
     $this->urlMatcher = $urlMatcher;
@@ -48,7 +51,7 @@ class RouterListener extends SymfonyRouterListener {
   }
 
   /**
-   * {@inheritdoc}
+   * Overrides Symfony\Component\HttpKernel\EventListener\RouterListener::onKernelRequest().
    *
    * This method is nearly identical to the parent, except it passes the
    * $request->attributes->get('system_path') variable to the matcher.
diff --git a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php
index 120ac7b..14d441c 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php
@@ -12,7 +12,6 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
 use Drupal\Core\ContentNegotiation;
 
 /**
@@ -24,8 +23,19 @@ use Drupal\Core\ContentNegotiation;
  */
 class ViewSubscriber implements EventSubscriberInterface {
 
+  /**
+   * The content negotiation object.
+   *
+   * @var Drupal\Core\ContentNegotiation
+   */
   protected $negotiation;
 
+  /**
+   * Constructs a Drupal\Core\EventSubscriber\ViewSubscriber object.
+   *
+   * @param Drupal\Core\ContentNegotiation $negotiation
+   *   The content negotiation object to use.
+   */
   public function __construct(ContentNegotiation $negotiation) {
     $this->negotiation = $negotiation;
   }
@@ -40,7 +50,10 @@ class ViewSubscriber implements EventSubscriberInterface {
    * Response object.
    *
    * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event
-   *   The Event to process.
+   *   The event to process.
+   *
+   * @return Symfony\Component\HttpFoundation\Response
+   *   A response.
    */
   public function onView(GetResponseEvent $event) {
 
@@ -56,6 +69,15 @@ class ViewSubscriber implements EventSubscriberInterface {
     }
   }
 
+  /**
+   * Processes a controller result into a JSON response.
+   *
+   * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event
+   *   The event to process.
+   *
+   * @return Symfony\Component\HttpFoundation\JsonResponse
+   *   A JSON response.
+   */
   public function onJson(GetResponseEvent $event) {
     $page_callback_result = $event->getControllerResult();
 
@@ -65,6 +87,15 @@ class ViewSubscriber implements EventSubscriberInterface {
     return $response;
   }
 
+  /**
+   * Processes a controller result into an AJAX response.
+   *
+   * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event
+   *   The event to process.
+   *
+   * @return Symfony\Component\HttpFoundation\JsonResponse
+   *   An AJAX response.
+   */
   public function onAjax(GetResponseEvent $event) {
     $page_callback_result = $event->getControllerResult();
 
@@ -79,6 +110,23 @@ class ViewSubscriber implements EventSubscriberInterface {
     return $response;
   }
 
+  /**
+   * Processes a controller result into an AJAX response wrapped in a textarea.
+   *
+   * Browser IFRAMEs expect HTML. Browser extensions such as Linkification and
+   * Skype's browser highlighter convert URLs, phone numbers, etc. into links.
+   * This corrupts the JSON response. Protect the integrity of the JSON data by
+   * making it the value of a textarea.
+   *
+   * @param Symfony\Component\HttpKernel\GetResponseEvent $event
+   *   The event to process.
+   *
+   * @return Symfony\Component\HttpFoundation\Response
+   *   A response.
+   *
+   * @see http://malsup.com/jquery/form/#file-upload
+   * @see http://drupal.org/node/1009382
+   */
   public function onIframeUpload(GetResponseEvent $event) {
     $page_callback_result = $event->getControllerResult();
 
@@ -86,12 +134,6 @@ class ViewSubscriber implements EventSubscriberInterface {
     $commands = ajax_prepare_response($page_callback_result);
     $json = ajax_render($commands);
 
-    // Browser IFRAMEs expect HTML. Browser extensions, such as Linkification
-    // and Skype's Browser Highlighter, convert URLs, phone numbers, etc. into
-    // links. This corrupts the JSON response. Protect the integrity of the
-    // JSON data by making it the value of a textarea.
-    // @see http://malsup.com/jquery/form/#file-upload
-    // @see http://drupal.org/node/1009382
     $html = '<textarea>' . $json . '</textarea>';
 
     return new Response($html);
@@ -108,6 +150,9 @@ class ViewSubscriber implements EventSubscriberInterface {
    *
    * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event
    *   The Event to process.
+   *
+   * @return Symfony\Component\HttpFoundation\Response
+   *   A response.
    */
   public function onHtml(GetResponseEvent $event) {
     $page_callback_result = $event->getControllerResult();
@@ -115,10 +160,7 @@ class ViewSubscriber implements EventSubscriberInterface {
   }
 
   /**
-   * Registers the methods in this class that should be listeners.
-   *
-   * @return array
-   *   An array of event listener definitions.
+   * Implements Symfony\Component\EventDispatcher\EventSubscriberInterface::getSubscribedEvents().
    */
   static function getSubscribedEvents() {
     $events[KernelEvents::VIEW][] = array('onView');
diff --git a/core/lib/Drupal/Core/ExceptionController.php b/core/lib/Drupal/Core/ExceptionController.php
index b163395..0bfc598 100644
--- a/core/lib/Drupal/Core/ExceptionController.php
+++ b/core/lib/Drupal/Core/ExceptionController.php
@@ -35,7 +35,7 @@ class ExceptionController {
   protected $negotiation;
 
   /**
-   * Constructor.
+   * Constructs a Drupal\Core\ExceptionController object.
    *
    * @param Symfony\Component\HttpKernel\HttpKernelInterface $kernel
    *   The kernel that spawned this controller, so that it can be reused
@@ -89,6 +89,9 @@ class ExceptionController {
    *   The flattened exception.
    * @param Symfony\Component\HttpFoundation\Request $request
    *   The request object that triggered this exception.
+   *
+   * @return Symfony\Component\HttpFoundation\Response
+   *   A response object to be sent to the server.
    */
   public function on403Html(FlattenException $exception, Request $request) {
     $system_path = $request->attributes->get('system_path');
@@ -145,6 +148,9 @@ class ExceptionController {
    *   The flattened exception.
    * @param Sonfony\Component\HttpFoundation\Request $request
    *   The request object that triggered this exception.
+   *
+   * @return Symfony\Component\HttpFoundation\Response
+   *   A response object to be sent to the server.
    */
   public function on404Html(FlattenException $exception, Request $request) {
     watchdog('page not found', check_plain($request->attributes->get('system_path')), NULL, WATCHDOG_WARNING);
@@ -210,6 +216,9 @@ class ExceptionController {
    *   Metadata about the exception that was thrown.
    * @param Symfony\Component\HttpFoundation\Request $request
    *   The request object that triggered this exception.
+   *
+   * @return Symfony\Component\HttpFoundation\Response
+   *   A response object to be sent to the server.
    */
   public function on500Html(FlattenException $exception, Request $request) {
     $error = $this->decodeException($exception);
@@ -274,6 +283,9 @@ class ExceptionController {
    *   The flattened exception.
    * @param Symfony\Component\HttpFoundation\Request $request
    *   The request object that triggered this exception.
+   *
+   * @return Symfony\Component\HttpFoundation\Response
+   *   A response object to be sent to the server.
    */
   public function on403Json(FlattenException $exception, Request $request) {
     $response = new JsonResponse();
@@ -288,6 +300,9 @@ class ExceptionController {
    *   The flattened exception.
    * @param Symfony\Component\HttpFoundation\Request $request
    *   The request object that triggered this exception.
+   *
+   * @return Symfony\Component\HttpFoundation\Response
+   *   A response object to be sent to the server.
    */
   public function on404Json(FlattenException $exception, Request $request) {
     $response = new JsonResponse();
@@ -302,6 +317,9 @@ class ExceptionController {
    *   The flattened exception.
    * @param Symfony\Component\HttpFoundation\Request $request
    *   The request object that triggered this exception.
+   *
+   * @return Symfony\Component\HttpFoundation\Response
+   *   A response object to be sent to the server.
    */
   public function on405Json(FlattenException $exception, Request $request) {
     $response = new JsonResponse();
@@ -371,7 +389,7 @@ class ExceptionController {
    * @param $backtrace
    *   A standard PHP backtrace.
    *
-   * @return
+   * @return array
    *   An associative array with keys 'file', 'line' and 'function'.
    */
   protected function getLastCaller($backtrace) {
diff --git a/core/lib/Drupal/Core/LegacyUrlMatcher.php b/core/lib/Drupal/Core/LegacyUrlMatcher.php
index 8828f36..7be030f 100644
--- a/core/lib/Drupal/Core/LegacyUrlMatcher.php
+++ b/core/lib/Drupal/Core/LegacyUrlMatcher.php
@@ -32,7 +32,7 @@ class LegacyUrlMatcher implements UrlMatcherInterface {
   protected $request;
 
   /**
-   * Constructor.
+   * Constructs a Drupal\Core\LegacyUrlMatcher object.
    */
   public function __construct() {
     // We will not actually use this object, but it's needed to conform to
@@ -41,30 +41,22 @@ class LegacyUrlMatcher implements UrlMatcherInterface {
   }
 
   /**
-   * Sets the request context.
+   * Implements Symfony\Component\Routing\RequestContextAwareInterface::setContext().
    *
    * This method is just to satisfy the interface, and is largely vestigial.
    * The request context object does not contain the information we need, so
    * we will use the original request object.
-   *
-   * @param Symfony\Component\Routing\RequestContext $context
-   *   The context.
-   *
-   * @api
    */
   public function setContext(RequestContext $context) {
     $this->context = $context;
   }
 
   /**
-   * Gets the request context.
+   * Implements Symfony\Component\Routing\RequestContextAwareInterface::getContext().
    *
    * This method is just to satisfy the interface, and is largely vestigial.
    * The request context object does not contain the information we need, so
    * we will use the original request object.
-   *
-   * @return Symfony\Component\Routing\RequestContext
-   *   The context.
    */
   public function getContext() {
     return $this->context;
@@ -86,7 +78,7 @@ class LegacyUrlMatcher implements UrlMatcherInterface {
   /**
    * Gets the request object.
    *
-   * @return Symfony\Component\HttpFoundation\Request $request
+   * @return Symfony\Component\HttpFoundation\Request
    *   The request object.
    */
   public function getRequest() {
@@ -94,9 +86,7 @@ class LegacyUrlMatcher implements UrlMatcherInterface {
   }
 
   /**
-   * {@inheritDoc}
-   *
-   * @api
+   * Implements Symfony\Component\Routing\Matcher\UrlMatcherInterface::match().
    */
   public function match($pathinfo) {
     if ($router_item = $this->matchDrupalItem($pathinfo)) {
@@ -119,13 +109,16 @@ class LegacyUrlMatcher implements UrlMatcherInterface {
   }
 
   /**
-   * Get a Drupal menu item.
+   * Gets a Drupal menu item.
    *
    * @todo Make this return multiple possible candidates for the resolver to
    *   consider.
    *
    * @param string $path
    *   The path being looked up by
+   *
+   * @return
+   *   A menu item that matches the given path.
    */
   protected function matchDrupalItem($path) {
     // For now we can just proxy our procedural method. At some point this will