More treeview cleanups.