Add extract variable refactor.