Merge "Change root visitor to use Object**."