Cleaned up tree parsing, still seem to have issues with 6.10.
Cleaned up tree parsing, still seem to have issues with 6.10.