Fix ObjectWalk to handle single-entry subtrees correctly