Integrate new extraction refactorings

Integrates the refactorings from https://github.com/scala-ide/scala-refactoring/pull/43