Simplify how type members are represented in the tree.
Update tests.