Merged fix-noweb after moving ZVG_tree to clutter.