diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php
index 4edbead..335d083 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -161,13 +161,16 @@ public function getContext() {
    *   The config factory object.
    */
   public function leaveContext() {
+    // Ensure at least one context is left on the stack. We already ensured
+    // there is at least one context set by taking the initial one in the
+    // constructor.
     if (count($this->contextStack) > 1) {
       array_pop($this->contextStack);
     }
     return $this;
   }
 
-  /*
+  /**
    * Gets the cache key for a given config name in a particular context.
    *
    * @param string $name
diff --git a/core/lib/Drupal/Core/Config/Context/ContextInterface.php b/core/lib/Drupal/Core/Config/Context/ContextInterface.php
index b3107a7..4361bfe 100644
--- a/core/lib/Drupal/Core/Config/Context/ContextInterface.php
+++ b/core/lib/Drupal/Core/Config/Context/ContextInterface.php
@@ -22,7 +22,7 @@
  */
 interface ContextInterface {
 
-  /*
+  /**
    * Initialises a config context for use.
    *
    * Creates a unique context identifier, adds data and notifies system about