Made changes to follow the new conventions in Visitor.