Block refactoring tool

Question

Is there a refactoring tool to remove c blocks? For example, convert

with Form1 do begin Height := Blah; Blubb := Name; end; 

to

 Form1.Height := Blah; Blubb := Form1.Name; 

where Form1 is VCL TForm. Optimally, it should work with Delphi 2007.

Answer 1

... I think the latest Castalia from Jacob Thurman / TwoDesk Software does the trick

Answer 2

One of Castalia's restoration tools is called Eliminate WITH.

I cannot comment on how well it works in non-trivial code, because I try to avoid the "c".