diff --git a/lib/parser.php b/lib/parser.php
index e73abf2bc16498..4255a9fc315663 100644
--- a/lib/parser.php
+++ b/lib/parser.php
@@ -1121,414 +1121,372 @@ private function peg_parseBlock_Attributes() {
         }
       }
       if ($s3 !== $this->peg_FAILED) {
-        $s4 = $this->peg_currPos;
+        $s4 = array();
         $s5 = array();
         $s6 = $this->peg_currPos;
         $s7 = $this->peg_currPos;
-        $s8 = array();
-        $s9 = $this->peg_currPos;
-        $s10 = $this->peg_currPos;
         $this->peg_silentFails++;
         if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
-          $s11 = $this->peg_c20;
+          $s8 = $this->peg_c20;
           $this->peg_currPos++;
         } else {
-          $s11 = $this->peg_FAILED;
+          $s8 = $this->peg_FAILED;
           if ($this->peg_silentFails === 0) {
               $this->peg_fail($this->peg_c21);
           }
         }
         $this->peg_silentFails--;
-        if ($s11 === $this->peg_FAILED) {
-          $s10 = null;
+        if ($s8 === $this->peg_FAILED) {
+          $s7 = null;
         } else {
-          $this->peg_currPos = $s10;
-          $s10 = $this->peg_FAILED;
+          $this->peg_currPos = $s7;
+          $s7 = $this->peg_FAILED;
         }
-        if ($s10 !== $this->peg_FAILED) {
+        if ($s7 !== $this->peg_FAILED) {
           if ($this->input_length > $this->peg_currPos) {
-            $s11 = $this->input_substr($this->peg_currPos, 1);
+            $s8 = $this->input_substr($this->peg_currPos, 1);
             $this->peg_currPos++;
           } else {
-            $s11 = $this->peg_FAILED;
+            $s8 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
                 $this->peg_fail($this->peg_c0);
             }
           }
-          if ($s11 !== $this->peg_FAILED) {
-            $s10 = array($s10, $s11);
-            $s9 = $s10;
+          if ($s8 !== $this->peg_FAILED) {
+            $s7 = array($s7, $s8);
+            $s6 = $s7;
           } else {
-            $this->peg_currPos = $s9;
-            $s9 = $this->peg_FAILED;
+            $this->peg_currPos = $s6;
+            $s6 = $this->peg_FAILED;
           }
         } else {
-          $this->peg_currPos = $s9;
-          $s9 = $this->peg_FAILED;
+          $this->peg_currPos = $s6;
+          $s6 = $this->peg_FAILED;
         }
-        if ($s9 !== $this->peg_FAILED) {
-          while ($s9 !== $this->peg_FAILED) {
-            $s8[] = $s9;
-            $s9 = $this->peg_currPos;
-            $s10 = $this->peg_currPos;
+        if ($s6 !== $this->peg_FAILED) {
+          while ($s6 !== $this->peg_FAILED) {
+            $s5[] = $s6;
+            $s6 = $this->peg_currPos;
+            $s7 = $this->peg_currPos;
             $this->peg_silentFails++;
             if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
-              $s11 = $this->peg_c20;
+              $s8 = $this->peg_c20;
               $this->peg_currPos++;
             } else {
-              $s11 = $this->peg_FAILED;
+              $s8 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
                   $this->peg_fail($this->peg_c21);
               }
             }
             $this->peg_silentFails--;
-            if ($s11 === $this->peg_FAILED) {
-              $s10 = null;
+            if ($s8 === $this->peg_FAILED) {
+              $s7 = null;
             } else {
-              $this->peg_currPos = $s10;
-              $s10 = $this->peg_FAILED;
+              $this->peg_currPos = $s7;
+              $s7 = $this->peg_FAILED;
             }
-            if ($s10 !== $this->peg_FAILED) {
+            if ($s7 !== $this->peg_FAILED) {
               if ($this->input_length > $this->peg_currPos) {
-                $s11 = $this->input_substr($this->peg_currPos, 1);
+                $s8 = $this->input_substr($this->peg_currPos, 1);
                 $this->peg_currPos++;
               } else {
-                $s11 = $this->peg_FAILED;
+                $s8 = $this->peg_FAILED;
                 if ($this->peg_silentFails === 0) {
                     $this->peg_fail($this->peg_c0);
                 }
               }
-              if ($s11 !== $this->peg_FAILED) {
-                $s10 = array($s10, $s11);
-                $s9 = $s10;
+              if ($s8 !== $this->peg_FAILED) {
+                $s7 = array($s7, $s8);
+                $s6 = $s7;
               } else {
-                $this->peg_currPos = $s9;
-                $s9 = $this->peg_FAILED;
+                $this->peg_currPos = $s6;
+                $s6 = $this->peg_FAILED;
               }
             } else {
-              $this->peg_currPos = $s9;
-              $s9 = $this->peg_FAILED;
+              $this->peg_currPos = $s6;
+              $s6 = $this->peg_FAILED;
             }
           }
         } else {
-          $s8 = $this->peg_FAILED;
-        }
-        if ($s8 !== $this->peg_FAILED) {
-          $s7 = $this->input_substr($s7, $this->peg_currPos - $s7);
-        } else {
-          $s7 = $s8;
-        }
-        if ($s7 !== $this->peg_FAILED) {
-          $s6 = $this->input_substr($s6, $this->peg_currPos - $s6);
-        } else {
-          $s6 = $s7;
+          $s5 = $this->peg_FAILED;
         }
-        if ($s6 === $this->peg_FAILED) {
+        if ($s5 === $this->peg_FAILED) {
+          $s5 = $this->peg_currPos;
           $s6 = $this->peg_currPos;
-          $s7 = $this->peg_currPos;
-          $s8 = $this->peg_currPos;
           $this->peg_silentFails++;
-          $s9 = $this->peg_currPos;
+          $s7 = $this->peg_currPos;
           if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
-            $s10 = $this->peg_c20;
+            $s8 = $this->peg_c20;
             $this->peg_currPos++;
           } else {
-            $s10 = $this->peg_FAILED;
+            $s8 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
                 $this->peg_fail($this->peg_c21);
             }
           }
-          if ($s10 !== $this->peg_FAILED) {
-            $s11 = $this->peg_parse__();
-            if ($s11 !== $this->peg_FAILED) {
-              $s12 = $this->peg_c22;
-              if ($s12 !== $this->peg_FAILED) {
+          if ($s8 !== $this->peg_FAILED) {
+            $s9 = $this->peg_parse__();
+            if ($s9 !== $this->peg_FAILED) {
+              $s10 = $this->peg_c22;
+              if ($s10 !== $this->peg_FAILED) {
                 if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c11) {
-                  $s13 = $this->peg_c11;
+                  $s11 = $this->peg_c11;
                   $this->peg_currPos++;
                 } else {
-                  $s13 = $this->peg_FAILED;
+                  $s11 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
                       $this->peg_fail($this->peg_c12);
                   }
                 }
-                if ($s13 === $this->peg_FAILED) {
-                  $s13 = null;
+                if ($s11 === $this->peg_FAILED) {
+                  $s11 = null;
                 }
-                if ($s13 !== $this->peg_FAILED) {
+                if ($s11 !== $this->peg_FAILED) {
                   if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
-                    $s14 = $this->peg_c7;
+                    $s12 = $this->peg_c7;
                     $this->peg_currPos += 3;
                   } else {
-                    $s14 = $this->peg_FAILED;
+                    $s12 = $this->peg_FAILED;
                     if ($this->peg_silentFails === 0) {
                         $this->peg_fail($this->peg_c8);
                     }
                   }
-                  if ($s14 !== $this->peg_FAILED) {
-                    $s10 = array($s10, $s11, $s12, $s13, $s14);
-                    $s9 = $s10;
+                  if ($s12 !== $this->peg_FAILED) {
+                    $s8 = array($s8, $s9, $s10, $s11, $s12);
+                    $s7 = $s8;
                   } else {
-                    $this->peg_currPos = $s9;
-                    $s9 = $this->peg_FAILED;
+                    $this->peg_currPos = $s7;
+                    $s7 = $this->peg_FAILED;
                   }
                 } else {
-                  $this->peg_currPos = $s9;
-                  $s9 = $this->peg_FAILED;
+                  $this->peg_currPos = $s7;
+                  $s7 = $this->peg_FAILED;
                 }
               } else {
-                $this->peg_currPos = $s9;
-                $s9 = $this->peg_FAILED;
+                $this->peg_currPos = $s7;
+                $s7 = $this->peg_FAILED;
               }
             } else {
-              $this->peg_currPos = $s9;
-              $s9 = $this->peg_FAILED;
+              $this->peg_currPos = $s7;
+              $s7 = $this->peg_FAILED;
             }
           } else {
-            $this->peg_currPos = $s9;
-            $s9 = $this->peg_FAILED;
+            $this->peg_currPos = $s7;
+            $s7 = $this->peg_FAILED;
           }
           $this->peg_silentFails--;
-          if ($s9 === $this->peg_FAILED) {
-            $s8 = null;
+          if ($s7 === $this->peg_FAILED) {
+            $s6 = null;
           } else {
-            $this->peg_currPos = $s8;
-            $s8 = $this->peg_FAILED;
+            $this->peg_currPos = $s6;
+            $s6 = $this->peg_FAILED;
           }
-          if ($s8 !== $this->peg_FAILED) {
+          if ($s6 !== $this->peg_FAILED) {
             if ($this->input_length > $this->peg_currPos) {
-              $s9 = $this->input_substr($this->peg_currPos, 1);
+              $s7 = $this->input_substr($this->peg_currPos, 1);
               $this->peg_currPos++;
             } else {
-              $s9 = $this->peg_FAILED;
+              $s7 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
                   $this->peg_fail($this->peg_c0);
               }
             }
-            if ($s9 !== $this->peg_FAILED) {
-              $s8 = array($s8, $s9);
-              $s7 = $s8;
+            if ($s7 !== $this->peg_FAILED) {
+              $s6 = array($s6, $s7);
+              $s5 = $s6;
             } else {
-              $this->peg_currPos = $s7;
-              $s7 = $this->peg_FAILED;
+              $this->peg_currPos = $s5;
+              $s5 = $this->peg_FAILED;
             }
           } else {
-            $this->peg_currPos = $s7;
-            $s7 = $this->peg_FAILED;
-          }
-          if ($s7 !== $this->peg_FAILED) {
-            $s6 = $this->input_substr($s6, $this->peg_currPos - $s6);
-          } else {
-            $s6 = $s7;
+            $this->peg_currPos = $s5;
+            $s5 = $this->peg_FAILED;
           }
         }
-        while ($s6 !== $this->peg_FAILED) {
-          $s5[] = $s6;
+        while ($s5 !== $this->peg_FAILED) {
+          $s4[] = $s5;
+          $s5 = array();
           $s6 = $this->peg_currPos;
           $s7 = $this->peg_currPos;
-          $s8 = array();
-          $s9 = $this->peg_currPos;
-          $s10 = $this->peg_currPos;
           $this->peg_silentFails++;
           if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
-            $s11 = $this->peg_c20;
+            $s8 = $this->peg_c20;
             $this->peg_currPos++;
           } else {
-            $s11 = $this->peg_FAILED;
+            $s8 = $this->peg_FAILED;
             if ($this->peg_silentFails === 0) {
                 $this->peg_fail($this->peg_c21);
             }
           }
           $this->peg_silentFails--;
-          if ($s11 === $this->peg_FAILED) {
-            $s10 = null;
+          if ($s8 === $this->peg_FAILED) {
+            $s7 = null;
           } else {
-            $this->peg_currPos = $s10;
-            $s10 = $this->peg_FAILED;
+            $this->peg_currPos = $s7;
+            $s7 = $this->peg_FAILED;
           }
-          if ($s10 !== $this->peg_FAILED) {
+          if ($s7 !== $this->peg_FAILED) {
             if ($this->input_length > $this->peg_currPos) {
-              $s11 = $this->input_substr($this->peg_currPos, 1);
+              $s8 = $this->input_substr($this->peg_currPos, 1);
               $this->peg_currPos++;
             } else {
-              $s11 = $this->peg_FAILED;
+              $s8 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
                   $this->peg_fail($this->peg_c0);
               }
             }
-            if ($s11 !== $this->peg_FAILED) {
-              $s10 = array($s10, $s11);
-              $s9 = $s10;
+            if ($s8 !== $this->peg_FAILED) {
+              $s7 = array($s7, $s8);
+              $s6 = $s7;
             } else {
-              $this->peg_currPos = $s9;
-              $s9 = $this->peg_FAILED;
+              $this->peg_currPos = $s6;
+              $s6 = $this->peg_FAILED;
             }
           } else {
-            $this->peg_currPos = $s9;
-            $s9 = $this->peg_FAILED;
+            $this->peg_currPos = $s6;
+            $s6 = $this->peg_FAILED;
           }
-          if ($s9 !== $this->peg_FAILED) {
-            while ($s9 !== $this->peg_FAILED) {
-              $s8[] = $s9;
-              $s9 = $this->peg_currPos;
-              $s10 = $this->peg_currPos;
+          if ($s6 !== $this->peg_FAILED) {
+            while ($s6 !== $this->peg_FAILED) {
+              $s5[] = $s6;
+              $s6 = $this->peg_currPos;
+              $s7 = $this->peg_currPos;
               $this->peg_silentFails++;
               if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
-                $s11 = $this->peg_c20;
+                $s8 = $this->peg_c20;
                 $this->peg_currPos++;
               } else {
-                $s11 = $this->peg_FAILED;
+                $s8 = $this->peg_FAILED;
                 if ($this->peg_silentFails === 0) {
                     $this->peg_fail($this->peg_c21);
                 }
               }
               $this->peg_silentFails--;
-              if ($s11 === $this->peg_FAILED) {
-                $s10 = null;
+              if ($s8 === $this->peg_FAILED) {
+                $s7 = null;
               } else {
-                $this->peg_currPos = $s10;
-                $s10 = $this->peg_FAILED;
+                $this->peg_currPos = $s7;
+                $s7 = $this->peg_FAILED;
               }
-              if ($s10 !== $this->peg_FAILED) {
+              if ($s7 !== $this->peg_FAILED) {
                 if ($this->input_length > $this->peg_currPos) {
-                  $s11 = $this->input_substr($this->peg_currPos, 1);
+                  $s8 = $this->input_substr($this->peg_currPos, 1);
                   $this->peg_currPos++;
                 } else {
-                  $s11 = $this->peg_FAILED;
+                  $s8 = $this->peg_FAILED;
                   if ($this->peg_silentFails === 0) {
                       $this->peg_fail($this->peg_c0);
                   }
                 }
-                if ($s11 !== $this->peg_FAILED) {
-                  $s10 = array($s10, $s11);
-                  $s9 = $s10;
+                if ($s8 !== $this->peg_FAILED) {
+                  $s7 = array($s7, $s8);
+                  $s6 = $s7;
                 } else {
-                  $this->peg_currPos = $s9;
-                  $s9 = $this->peg_FAILED;
+                  $this->peg_currPos = $s6;
+                  $s6 = $this->peg_FAILED;
                 }
               } else {
-                $this->peg_currPos = $s9;
-                $s9 = $this->peg_FAILED;
+                $this->peg_currPos = $s6;
+                $s6 = $this->peg_FAILED;
               }
             }
           } else {
-            $s8 = $this->peg_FAILED;
-          }
-          if ($s8 !== $this->peg_FAILED) {
-            $s7 = $this->input_substr($s7, $this->peg_currPos - $s7);
-          } else {
-            $s7 = $s8;
-          }
-          if ($s7 !== $this->peg_FAILED) {
-            $s6 = $this->input_substr($s6, $this->peg_currPos - $s6);
-          } else {
-            $s6 = $s7;
+            $s5 = $this->peg_FAILED;
           }
-          if ($s6 === $this->peg_FAILED) {
+          if ($s5 === $this->peg_FAILED) {
+            $s5 = $this->peg_currPos;
             $s6 = $this->peg_currPos;
-            $s7 = $this->peg_currPos;
-            $s8 = $this->peg_currPos;
             $this->peg_silentFails++;
-            $s9 = $this->peg_currPos;
+            $s7 = $this->peg_currPos;
             if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
-              $s10 = $this->peg_c20;
+              $s8 = $this->peg_c20;
               $this->peg_currPos++;
             } else {
-              $s10 = $this->peg_FAILED;
+              $s8 = $this->peg_FAILED;
               if ($this->peg_silentFails === 0) {
                   $this->peg_fail($this->peg_c21);
               }
             }
-            if ($s10 !== $this->peg_FAILED) {
-              $s11 = $this->peg_parse__();
-              if ($s11 !== $this->peg_FAILED) {
-                $s12 = $this->peg_c22;
-                if ($s12 !== $this->peg_FAILED) {
+            if ($s8 !== $this->peg_FAILED) {
+              $s9 = $this->peg_parse__();
+              if ($s9 !== $this->peg_FAILED) {
+                $s10 = $this->peg_c22;
+                if ($s10 !== $this->peg_FAILED) {
                   if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c11) {
-                    $s13 = $this->peg_c11;
+                    $s11 = $this->peg_c11;
                     $this->peg_currPos++;
                   } else {
-                    $s13 = $this->peg_FAILED;
+                    $s11 = $this->peg_FAILED;
                     if ($this->peg_silentFails === 0) {
                         $this->peg_fail($this->peg_c12);
                     }
                   }
-                  if ($s13 === $this->peg_FAILED) {
-                    $s13 = null;
+                  if ($s11 === $this->peg_FAILED) {
+                    $s11 = null;
                   }
-                  if ($s13 !== $this->peg_FAILED) {
+                  if ($s11 !== $this->peg_FAILED) {
                     if ($this->input_substr($this->peg_currPos, 3) === $this->peg_c7) {
-                      $s14 = $this->peg_c7;
+                      $s12 = $this->peg_c7;
                       $this->peg_currPos += 3;
                     } else {
-                      $s14 = $this->peg_FAILED;
+                      $s12 = $this->peg_FAILED;
                       if ($this->peg_silentFails === 0) {
                           $this->peg_fail($this->peg_c8);
                       }
                     }
-                    if ($s14 !== $this->peg_FAILED) {
-                      $s10 = array($s10, $s11, $s12, $s13, $s14);
-                      $s9 = $s10;
+                    if ($s12 !== $this->peg_FAILED) {
+                      $s8 = array($s8, $s9, $s10, $s11, $s12);
+                      $s7 = $s8;
                     } else {
-                      $this->peg_currPos = $s9;
-                      $s9 = $this->peg_FAILED;
+                      $this->peg_currPos = $s7;
+                      $s7 = $this->peg_FAILED;
                     }
                   } else {
-                    $this->peg_currPos = $s9;
-                    $s9 = $this->peg_FAILED;
+                    $this->peg_currPos = $s7;
+                    $s7 = $this->peg_FAILED;
                   }
                 } else {
-                  $this->peg_currPos = $s9;
-                  $s9 = $this->peg_FAILED;
+                  $this->peg_currPos = $s7;
+                  $s7 = $this->peg_FAILED;
                 }
               } else {
-                $this->peg_currPos = $s9;
-                $s9 = $this->peg_FAILED;
+                $this->peg_currPos = $s7;
+                $s7 = $this->peg_FAILED;
               }
             } else {
-              $this->peg_currPos = $s9;
-              $s9 = $this->peg_FAILED;
+              $this->peg_currPos = $s7;
+              $s7 = $this->peg_FAILED;
             }
             $this->peg_silentFails--;
-            if ($s9 === $this->peg_FAILED) {
-              $s8 = null;
+            if ($s7 === $this->peg_FAILED) {
+              $s6 = null;
             } else {
-              $this->peg_currPos = $s8;
-              $s8 = $this->peg_FAILED;
+              $this->peg_currPos = $s6;
+              $s6 = $this->peg_FAILED;
             }
-            if ($s8 !== $this->peg_FAILED) {
+            if ($s6 !== $this->peg_FAILED) {
               if ($this->input_length > $this->peg_currPos) {
-                $s9 = $this->input_substr($this->peg_currPos, 1);
+                $s7 = $this->input_substr($this->peg_currPos, 1);
                 $this->peg_currPos++;
               } else {
-                $s9 = $this->peg_FAILED;
+                $s7 = $this->peg_FAILED;
                 if ($this->peg_silentFails === 0) {
                     $this->peg_fail($this->peg_c0);
                 }
               }
-              if ($s9 !== $this->peg_FAILED) {
-                $s8 = array($s8, $s9);
-                $s7 = $s8;
+              if ($s7 !== $this->peg_FAILED) {
+                $s6 = array($s6, $s7);
+                $s5 = $s6;
               } else {
-                $this->peg_currPos = $s7;
-                $s7 = $this->peg_FAILED;
+                $this->peg_currPos = $s5;
+                $s5 = $this->peg_FAILED;
               }
             } else {
-              $this->peg_currPos = $s7;
-              $s7 = $this->peg_FAILED;
-            }
-            if ($s7 !== $this->peg_FAILED) {
-              $s6 = $this->input_substr($s6, $this->peg_currPos - $s6);
-            } else {
-              $s6 = $s7;
+              $this->peg_currPos = $s5;
+              $s5 = $this->peg_FAILED;
             }
           }
         }
-        if ($s5 !== $this->peg_FAILED) {
-          $s4 = $this->input_substr($s4, $this->peg_currPos - $s4);
-        } else {
-          $s4 = $s5;
-        }
         if ($s4 !== $this->peg_FAILED) {
           if ($this->input_substr($this->peg_currPos, 1) === $this->peg_c20) {
             $s5 = $this->peg_c20;