Fixed bug in extract-method. Shadowed vars should not be take as new
fucntion arguments.