Well search and replace does most of the work. Thanks for stopping this, glad we can avoid the BC break in all those cmf bundles.
I am curious to know what @dantleech was planning to do with the tree form-type again.