Cleaned up IndexTree somewhat.