6b65fc1286
Also change the Extractor API to align with the Codegen API (internal APIs)
Also change the Extractor API to align with the Codegen API (internal APIs)