diff --git a/ctags.d b/ctags.d
index a608923..1cd3d72 100755
--- a/ctags.d
+++ b/ctags.d
@@ -31,24 +31,33 @@ class CTagsPrinter : ASTVisitor
 	override void visit(ClassDeclaration dec)
 	{
 		tagLines ~= "%s\t%s\t%d;\"\tc".format(dec.name.value, fileName, dec.name.line);
-		dec.structBody.accept(this);
+		dec.accept(this);
 	}
 
 	override void visit(InterfaceDeclaration dec)
 	{
 		tagLines ~= "%s\t%s\t%d;\"\tc".format(dec.name.value, fileName, dec.name.line);
-		dec.structBody.accept(this);
+		dec.accept(this);
 	}
 
 	override void visit(FunctionDeclaration dec)
 	{
 		tagLines ~= "%s\t%s\t%d;\"\tf\tarity:%d".format(dec.name.value, fileName,
 			dec.name.line, dec.parameters.parameters.length);
+		dec.accept(this);
 	}
 
 	override void visit(EnumDeclaration dec)
 	{
 		tagLines ~= "%s\t%s\t%d;\"\tg".format(dec.name.value, fileName, dec.name.line);
+		dec.accept(this);
+	}
+
+	override void visit(VariableDeclaration dec)
+	{
+		foreach (d; dec.declarators)
+			tagLines ~= "%s\t%s\t%d;\"\tv".format(d.name.value, fileName, d.name.line);
+		dec.accept(this);
 	}
 
 	void print(File output)
diff --git a/std/d/ast.d b/std/d/ast.d
index be46bee..b92cf81 100755
--- a/std/d/ast.d
+++ b/std/d/ast.d
@@ -84,6 +84,7 @@ public:
     /** */ void visit(DebugCondition debugCondition) { debugCondition.accept(this); }
     /** */ void visit(DebugSpecification debugSpecification) { debugSpecification.accept(this); }
     /** */ void visit(Declaration declaration) { declaration.accept(this); }
+    /** */ void visit(DeclarationOrStatement declarationsOrStatement) { declarationsOrStatement.accept(this); }
     /** */ void visit(DeclarationsAndStatements declarationsAndStatements) { declarationsAndStatements.accept(this); }
     /** */ void visit(Declarator declarator) { declarator.accept(this); }
     /** */ void visit(DefaultStatement defaultStatement) { defaultStatement.accept(this); }
@@ -566,7 +567,10 @@ public:
 class BlockStatement : ASTNode
 {
 public:
-    mixin(DEFAULT_ACCEPT);
+    override void accept(ASTVisitor visitor)
+	{
+		visitor.visit(declarationsAndStatements);
+	}
 
     /**
      * Byte position of the opening brace
@@ -840,7 +844,12 @@ public:
 ///
 class DeclarationsAndStatements : ASTNode
 {
-    mixin(DEFAULT_ACCEPT);
+    override void accept(ASTVisitor visitor)
+	{
+		foreach (das; declarationsAndStatements)
+			visitor.visit(das);
+	}
+
     /** */ DeclarationOrStatement[] declarationsAndStatements;
 }
 
@@ -848,7 +857,14 @@ class DeclarationsAndStatements : ASTNode
 class DeclarationOrStatement : ASTNode
 {
 public:
-    mixin(DEFAULT_ACCEPT);
+    override void accept(ASTVisitor visitor)
+	{
+		if (declaration !is null)
+			visitor.visit(declaration);
+		else if (statement !is null)
+			visitor.visit(statement);
+	}
+
     /** */ Declaration declaration;
     /** */ Statement statement;
 }
@@ -1034,7 +1050,14 @@ public:
 class FunctionBody : ASTNode
 {
 public:
-    mixin(DEFAULT_ACCEPT);
+    override void accept(ASTVisitor visitor)
+	{
+		if (inStatement !is null) visitor.visit(inStatement);
+		if (outStatement !is null) visitor.visit(outStatement);
+		if (bodyStatement !is null) visitor.visit(bodyStatement);
+		if (blockStatement !is null) visitor.visit(blockStatement);
+	}
+
     /** */ BlockStatement blockStatement;
     /** */ BodyStatement bodyStatement;
     /** */ OutStatement outStatement;
@@ -1063,7 +1086,11 @@ public:
 class FunctionDeclaration : ASTNode
 {
 public:
-    mixin(DEFAULT_ACCEPT);
+    override void accept(ASTVisitor visitor)
+	{
+		if (functionBody !is null) visitor.visit(functionBody);
+	}
+
     /** */ bool hasAuto;
     /** */ bool hasRef;
     /** */ Type returnType;
diff --git a/std/d/parser.d b/std/d/parser.d
index 9c6945a..7d0157c 100755
--- a/std/d/parser.d
+++ b/std/d/parser.d
@@ -1,20 +1,12 @@
 // Written in the D programming language
 
 /**
- * <script type="text/javascript">inhibitQuickIndex = 1</script>
- * <style type="text/css">
- * .grammar_ruledef { font-weight: bold; }
- * .grammar_rule { font-weight: bold; }
- * .grammar_literal { color: crimson; }
- * </style>
  * This module contains a _parser for D source code.
  *
  * Grammar:
  * The grammar format used in the documentation of this module generally follows
  * the format used by the ANTLR _parser generator.
  * $(UL
- * $(LI Literals are highlighted in green.)
- * $(LI Rules are links to their definitions.)
  * $(LI Tokens and rules can be grouped by parenthesis.)
  * $(LI An asterisk (*) indicates that the previous rule, token, or group
  * can repeat 0 or more times.)
@@ -55,14 +47,9 @@
  * ---
  *
  * Copyright: Brian Schott 2013
- * License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt Boost, License 1.0)
+ * License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Authors: Brian Schott
  * Source: $(PHOBOSSRC std/d/_parser.d)
- * MACROS:
- *     GRAMMAR = <pre class="grammar">$0</pre>
- *     RULEDEF = <a name="$0"><span class="grammar_ruledef">$0</span></a>
- *     RULE = <a href="#$0"><span class="grammar_rule">$0</span></a>
- *     LITERAL = <span class="grammar_literal">$0</span>
  */
 
 module std.d.parser;