diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 461370263f7..e70a4ad2cef 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1412,6 +1412,7 @@ function install_bootstrap_full(&$install_state) {
   // Clear the module list that was overriden earlier in the process.
   // This will allow all freshly installed modules to be loaded.
   module_list_reset();
+  // @todo Figure out how best to handle the Kernel constructor parameters.
   $kernel = new DrupalKernel('prod', FALSE);
   $kernel->boot();
   drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 6b201877afe..67373104378 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -23,9 +23,8 @@ class DrupalKernel extends Kernel {
       new CoreBundle(),
     );
 
-    // TODO: Somehow remove the necessity of calling system_list() to find out which
-    // bundles exist.
-
+    // TODO: Remove the necessity of calling system_list() to find out which
+    // bundles exist. See http://drupal.org/node/1331486
     $modules = array_keys(system_list('module_enabled'));
     foreach ($modules as $module) {
       $camelized = ContainerBuilder::camelize($module);
diff --git a/index.php b/index.php
index a793cc8659e..38177ab2b5b 100644
--- a/index.php
+++ b/index.php
@@ -27,6 +27,7 @@ define('DRUPAL_ROOT', getcwd());
 require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc';
 drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE);
 
+// @todo Figure out how best to handle the Kernel constructor parameters.
 $kernel = new DrupalKernel('prod', FALSE);
 
 // Create a request object from the HTTPFoundation.