diff --git a/stdx/d/parser.d b/stdx/d/parser.d
index 6f80dff..9c6a0f3 100644
--- a/stdx/d/parser.d
+++ b/stdx/d/parser.d
@@ -111,7 +111,7 @@ struct Parser
      * Parses an AliasDeclaration.
      *
      * $(GRAMMAR $(RULEDEF aliasDeclaration):
-     *       $(LITERAL 'alias') $(RULE aliasInitializer) $(LPAREN)$(LITERAL ',') $(RULE aliasInitializer)$(RPAREN)*
+     *       $(LITERAL 'alias') $(RULE aliasInitializer) $(LPAREN)$(LITERAL ',') $(RULE aliasInitializer)$(RPAREN)* $(LITERAL ';')
      *     | $(LITERAL 'alias') $(RULE type) $(LITERAL identifier) $(LITERAL ';')
      *     ;)
      */
@@ -6423,7 +6423,7 @@ private:
 
     bool startsWith(TokenType[] types...) const nothrow
     {
-        if (index >= tokens.length)
+        if (index + types.length >= tokens.length)
             return false;
         for (size_t i = 0; (i < types.length) && ((index + i) < tokens.length); ++i)
         {