Merge "Remove RefBase from the extractor API"