Improved the polymorphic tree modules.