Merge "Adding TREE_SIZE macro + cleanup."