Yes, you're right, a tree-wide sweep will be necessary.
Since you gained so much experience doing tree-wide sweeps to clean up template hierarchies for Greenpeace I sorta figured you'd just pop up and volunteer to do the job! :)
(ouch, quit hitting me, you insensitive Dane with no sense of humor!)
