I had to do the same thing on tree-cleanup-branch. Similar reasons.
You also want to unconditionally call modify_stmt in here. So you end
up with:
Can you to import it in from that branch? I don't have that branch
checked out anyplace yet. Or else just send me the ChangeLog
for it and I'll do it.
Thanks.