Refactoring the extract phase -- incomplete.