Improvements in the inorder iterator and renaming.