js/big_pipe.js                  |  8 +++----
 src/Render/BigPipe.php          | 47 +++++++++++++++++++++++++++--------------
 src/Render/BigPipeInterface.php |  2 +-
 src/Render/BigPipeMarkup.php    |  2 +-
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/js/big_pipe.js b/js/big_pipe.js
index 41dbc67..2deefec 100644
--- a/js/big_pipe.js
+++ b/js/big_pipe.js
@@ -27,7 +27,7 @@
       // commands is still arriving), textContent will be empty which will cause
       // JSON.parse() to fail. Remove once so that it can be processed again
       // later.
-      // @see bigPipeProcessContainer()
+      // @see bigPipeProcessDocument()
       if (content === '') {
         $(this).removeOnce('big-pipe');
       }
@@ -43,7 +43,7 @@
         });
         // Then, simulate an AJAX response having arrived, and let the Ajax
         // system handle it.
-        ajaxObject.success(response);
+        ajaxObject.success(response, 'success');
       }
     }
   }
@@ -52,8 +52,8 @@
    * Processes a streamed HTML document receiving placeholder replacements.
    *
    * @param {HTMLDocument} context
-   *   The HTML document containing <script type="application/vnd.drupal-ajax">
-   *   tags generated by BigPipe.
+   *   The HTML document containing <script type="application/json"> tags
+   *   generated by BigPipe.
    *
    * @return {bool}
    *   Returns true when processing has been finished and a stop signal has been
diff --git a/src/Render/BigPipe.php b/src/Render/BigPipe.php
index cf37306..cb30d2a 100644
--- a/src/Render/BigPipe.php
+++ b/src/Render/BigPipe.php
@@ -14,10 +14,11 @@ use Drupal\Core\Ajax\ReplaceCommand;
 use Drupal\Core\Asset\AttachedAssets;
 use Drupal\Core\Asset\AttachedAssetsInterface;
 use Drupal\Core\Render\HtmlResponse;
-use Drupal\Core\Render\Markup;
 use Drupal\Core\Render\RendererInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -171,11 +172,8 @@ class BigPipe implements BigPipeInterface {
       // HTML response being processed by HtmlResponseAttachmentsProcessor and
       // hence the HTML to load the bottom JavaScript can be rendered.
       $fake_request = $this->requestStack->getMasterRequest()->duplicate();
-      $this->requestStack->push($fake_request);
-      $event = new FilterResponseEvent($this->httpKernel, $fake_request, HttpKernelInterface::SUB_REQUEST, $html_response);
-      $this->eventDispatcher->dispatch(KernelEvents::RESPONSE, $event);
-      $this->requestStack->pop();
-      $scripts_bottom = $event->getResponse()->getContent();
+      $html_response = $this->filterEmbeddedResponse($fake_request, $html_response);
+      $scripts_bottom = $html_response->getContent();
     }
 
     print $scripts_bottom;
@@ -251,11 +249,7 @@ class BigPipe implements BigPipeInterface {
       // - the HTML to load the JS (at the top) can be rendered.
       $fake_request = $this->requestStack->getMasterRequest()->duplicate();
       $fake_request->request->set('ajax_page_state', ['libraries' => implode(',', $cumulative_assets->getAlreadyLoadedLibraries())]);
-      $this->requestStack->push($fake_request);
-      $event = new FilterResponseEvent($this->httpKernel, $fake_request, HttpKernelInterface::SUB_REQUEST, $html_response);
-      $this->eventDispatcher->dispatch(KernelEvents::RESPONSE, $event);
-      $html_response = $event->getResponse();
-      $this->requestStack->pop();
+      $html_response = $this->filterEmbeddedResponse($fake_request, $html_response);
 
       // Send this embedded HTML response.
       print $html_response->getContent();
@@ -333,11 +327,7 @@ class BigPipe implements BigPipeInterface {
       //   allows us to track the total set of asset libraries sent in the
       //   initial HTML response plus all embedded AJAX responses sent so far.
       $fake_request->request->set('ajax_page_state', ['libraries' => implode(',', $cumulative_assets->getAlreadyLoadedLibraries())] + $cumulative_assets->getSettings()['ajaxPageState']);
-      $this->requestStack->push($fake_request);
-      $event = new FilterResponseEvent($this->httpKernel, $fake_request, HttpKernelInterface::SUB_REQUEST, $ajax_response);
-      $this->eventDispatcher->dispatch(KernelEvents::RESPONSE, $event);
-      $ajax_response = $event->getResponse();
-      $this->requestStack->pop();
+      $ajax_response = $this->filterEmbeddedResponse($fake_request, $ajax_response);
 
       // Send this embedded AJAX response.
       $json = $ajax_response->getContent();
@@ -363,6 +353,31 @@ EOF;
   }
 
   /**
+   * Filters the given embedded response, using the cumulative AJAX page state.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $fake_request
+   *   A fake subrequest that contains the cumulative AJAX page state of the
+   *   HTML document and all preceding Embedded HTML or AJAX responses.
+   * @param \Symfony\Component\HttpFoundation\Response|\Drupal\Core\Render\HtmlResponse|\Drupal\Core\Ajax\AjaxResponse $embedded_response
+   *   Either a HTML response or an AJAX response that will be embedded in the
+   *   overall HTML response.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   The filtered response, which will load only the assets that $fake_request
+   *   did not indicate to already have been loaded, plus the updated cumulative
+   *   AJAX page state.
+   */
+  protected function filterEmbeddedResponse(Request $fake_request, Response $embedded_response) {
+    assert('$embedded_response instanceof \Drupal\Core\Render\HtmlResponse || $embedded_response instanceof \Drupal\Core\Ajax\AjaxResponse');
+    $this->requestStack->push($fake_request);
+    $event = new FilterResponseEvent($this->httpKernel, $fake_request, HttpKernelInterface::SUB_REQUEST, $embedded_response);
+    $this->eventDispatcher->dispatch(KernelEvents::RESPONSE, $event);
+    $filtered_response = $event->getResponse();
+    $this->requestStack->pop();
+    return $filtered_response;
+  }
+
+  /**
    * Sends </body> and everything after it.
    *
    * @param string $post_body
diff --git a/src/Render/BigPipeInterface.php b/src/Render/BigPipeInterface.php
index f4066a3..c583c30 100644
--- a/src/Render/BigPipeInterface.php
+++ b/src/Render/BigPipeInterface.php
@@ -61,7 +61,7 @@ namespace Drupal\big_pipe\Render;
  *     asset libraries again. A HTML page can have multiple AJAX responses, each
  *     of which should take into account the combined AJAX page state of the
  *     HTML document and all preceding AJAX responses.
- *   - BigPipe does not use of multiple AJAX requests/responses. It uses a
+ *   - BigPipe does not make use of multiple AJAX requests/responses. It uses a
  *     single HTML response. But it is a more long-lived one: The Skeleton is
  *     sent first, the closing </body> tag is not yet sent, and the connection
  *     is kept open. Whenever another BigPipe Placeholder is rendered, Drupal
diff --git a/src/Render/BigPipeMarkup.php b/src/Render/BigPipeMarkup.php
index 2b96e4a..d16d909 100644
--- a/src/Render/BigPipeMarkup.php
+++ b/src/Render/BigPipeMarkup.php
@@ -11,7 +11,7 @@ use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Render\MarkupTrait;
 
 /**
- * Defines an object that passes safe strings through the Views render system.
+ * Defines an object that passes safe strings through BigPipe's render pipeline.
  *
  * This object should only be constructed with a known safe string. If there is
  * any risk that the string contains user-entered data that has not been