trees: some cleanup.