Comments and cleanup in ConcreteASTVisitor