Fix another bug in reproducing ClassDeclaration