diff --git a/src/jastadd/ast/Comments.jrag b/src/jastadd/ast/Comments.jrag
index 3a6731f5884c2d7948638a29f157586839251b0a..6728c9d6e2eb08ac70feddf955859830c17c1b90 100644
--- a/src/jastadd/ast/Comments.jrag
+++ b/src/jastadd/ast/Comments.jrag
@@ -142,7 +142,7 @@ outer: while (true) {
    * @param obj original class body object
    * @return generated javadoc comment
    */
-  public String ASTDecl.docComment(ClassBodyObject obj) {
+  public String TypeDecl.docComment(ClassBodyObject obj) {
     JavaDocParser parser = new JavaDocParser();
     TemplateContext tt = templateContext();
     tt.bind("SourceComment", parser.parse(obj.comments));
diff --git a/src/jastadd/ast/JastAddCodeGen.jadd b/src/jastadd/ast/JastAddCodeGen.jadd
index b2c19256c389a2167e12e30c4555ea5871b12031..1ba4b6ac92fdf5f34ebb805930b699c3aa518b1d 100644
--- a/src/jastadd/ast/JastAddCodeGen.jadd
+++ b/src/jastadd/ast/JastAddCodeGen.jadd
@@ -298,15 +298,7 @@ aspect JastAddCodeGen {
       ByteArrayOutputStream bos = new ByteArrayOutputStream();
       PrintStream stream = new PrintStream(bos, true, "UTF-8");
       stream.println(typeDeclarationString());
-      StringBuffer buf = new StringBuffer();
-      for (ClassBodyObject obj : classBodyDecls) {
-        org.jastadd.jrag.AST.SimpleNode n = obj.node;
-        buf.append(config().indent);
-        buf.append(obj.modifiers());
-        n.jjtAccept(new ClassBodyDeclUnparser(), buf);
-        buf.append("\n\n");
-      }
-      stream.println(buf.toString());
+      emitMembers(stream);
       emitAbstractSyns(stream);
       emitInhDeclarations(stream);
       stream.close();
diff --git a/src/jastadd/ast/JragCodeGen.jrag b/src/jastadd/ast/JragCodeGen.jrag
index 6e3cd692a7ac2cd9fc791ab692e4b7d08a4c65af..7a132ce4df95e5e650e272844c71a291582da32b 100644
--- a/src/jastadd/ast/JragCodeGen.jrag
+++ b/src/jastadd/ast/JragCodeGen.jrag
@@ -289,9 +289,7 @@ aspect JragCodeGen {
     }
   }
 
-  public void TypeDecl.emitMembers(PrintStream out) { }
-
-  public void ASTDecl.emitMembers(PrintStream out) {
+  public void TypeDecl.emitMembers(PrintStream out) {
     for (ClassBodyObject obj : classBodyDecls) {
       org.jastadd.jrag.AST.SimpleNode node = obj.node;
       out.print(obj.modifiers());