Extractor::expand_{left,right} merged into single Extractor::expand; Extractor::store_extracted -> Extractor::store_expanded
Refactoring Extractor
Refactoring Extractor