diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
index 78c4dcf..1a8f129 100644
--- a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
+++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
@@ -48,10 +48,10 @@ public function build($class_name) {
       $output .= ' implements ' . implode(', ', $interfaces);
     }
 
-    $output .= " {\n";
+    $output .= <<<EOS
+ {
 
-    // Add the variables.
-    $output .= "\n/**
+/**
  * @var string
  */
 protected \$serviceId;
@@ -59,7 +59,10 @@ public function build($class_name) {
 /**
  * @var \\$class_name
  */
-protected \$service;\n\n";
+protected \$service;
+
+
+EOS;
 
     // Add all the methods.
     $methods = [];
@@ -81,7 +84,7 @@ public function build($class_name) {
 
     $output .= implode("\n", $methods);
 
-    // Intend the output.
+    // Indent the output.
     $output = implode("\n", array_map(function($value) {
       if ($value === '') {
         return $value;
@@ -98,7 +101,8 @@ public function build($class_name) {
    * @return string
    */
   protected function buildLazyLoadItselfMethod() {
-    $output = "protected function lazyLoadItself() {
+    $output = <<<EOS
+protected function lazyLoadItself() {
   if (!isset(\$this->service)) {
     \$method_name = 'get' . Container::camelize(\$this->serviceId) . 'Service';
     \$this->service = \\Drupal::getContainer()->\$method_name(FALSE);
@@ -106,7 +110,8 @@ protected function buildLazyLoadItselfMethod() {
 
   return \$this->service;
 }
-";
+
+EOS;
 
     return $output;
   }
@@ -207,10 +212,12 @@ protected function buildMethodBody(\ReflectionMethod $reflection_method) {
    * @return string
    */
   protected function buildConstructorMethod() {
-    $output = 'public function __construct($service_id) {
-  $this->serviceId = $service_id;
+    $output = <<<EOS
+public function __construct(\$service_id) {
+  \$this->serviceId = \$service_id;
 }
-';
+
+EOS;
 
     return $output;
   }