Move Service AST xform to CLASS_GENERATION phase