Tool to refactor "with" blocks

Question

Is there a refactoring tool to remove "with" blocks? For example convert

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

to

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

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

Answer 1

Model Maker Code Explorer, which became free recently, has "Convert with statement" tool. While it is not a fully automated refactoring, it might be useful, if Castalia does not work

Answer 2

One of the Castalia refactoring tools is named "Eliminate 'WITH'".

I can't comment on how well it works in non trivial code because I tend to avoid "with".