diff --git a/elm.json b/elm.json
index 1c32573..84e3a0e 100644
--- a/elm.json
+++ b/elm.json
@@ -5,6 +5,8 @@
     "license": "EUPL-1.1",
     "version": "2.1.2",
     "exposed-modules": [
+        "Internal.Grammar.ServerName",
+        "Internal.Grammar.UserId",
         "Matrix",
         "Matrix.Event",
         "Matrix.Settings"
diff --git a/src/Internal/Tools/ParserExtra.elm b/src/Internal/Tools/ParserExtra.elm
index 0148b3b..376563f 100644
--- a/src/Internal/Tools/ParserExtra.elm
+++ b/src/Internal/Tools/ParserExtra.elm
@@ -1,6 +1,7 @@
 module Internal.Tools.ParserExtra exposing (..)
 
-import Parser as P exposing (Parser, (|.), (|=))
+import Parser as P exposing ((|.), (|=), Parser)
+
 
 zeroOrMore : Parser a -> Parser (List a)
 zeroOrMore parser =
@@ -13,12 +14,14 @@ zeroOrMore parser =
                 ]
         )
 
+
 oneOrMore : Parser a -> Parser (List a)
 oneOrMore parser =
     P.succeed (::)
         |= parser
         |= zeroOrMore parser
 
+
 atLeast : Int -> Parser a -> Parser (List a)
 atLeast n parser =
     P.loop []
@@ -26,6 +29,7 @@ atLeast n parser =
             if List.length tail < n then
                 P.succeed (\head -> P.Loop (head :: tail))
                     |= parser
+
             else
                 P.oneOf
                     [ P.succeed (\head -> P.Loop (head :: tail))
@@ -34,6 +38,7 @@ atLeast n parser =
                     ]
         )
 
+
 atMost : Int -> Parser a -> Parser (List a)
 atMost n parser =
     P.loop []
@@ -44,33 +49,40 @@ atMost n parser =
                         |= parser
                     , P.succeed (P.Done (List.reverse tail))
                     ]
+
             else
                 P.succeed (P.Done (List.reverse tail))
         )
 
+
 times : Int -> Int -> Parser a -> Parser (List a)
 times inf sup parser =
     let
         low : Int
-        low = max 0 (min inf sup)
+        low =
+            max 0 (min inf sup)
 
         high : Int
-        high = max 0 sup
+        high =
+            max 0 sup
     in
-        P.loop []
-            (\tail ->
-                if List.length tail < low then
-                    P.succeed (\head -> P.Loop (head :: tail))
+    P.loop []
+        (\tail ->
+            if List.length tail < low then
+                P.succeed (\head -> P.Loop (head :: tail))
+                    |= parser
+
+            else if List.length tail < high then
+                P.oneOf
+                    [ P.succeed (\head -> P.Loop (head :: tail))
                         |= parser
-                else if List.length tail < high then
-                    P.oneOf
-                        [ P.succeed (\head -> P.Loop (head :: tail))
-                            |= parser
-                        , P.succeed (P.Done (List.reverse tail))
-                        ]
-                else
-                    P.succeed (P.Done (List.reverse tail))
-            )
+                    , P.succeed (P.Done (List.reverse tail))
+                    ]
+
+            else
+                P.succeed (P.Done (List.reverse tail))
+        )
+
 
 exactly : Int -> Parser a -> Parser (List a)
 exactly n =