I had roughly the same changes in a tree of mine last week. I've committed them now, since we know we want to make the change. If there are any mistakes we can fix them up later when someone can test on an Alpha. Thanks, Roland