Additional modifications removing Agent Visitor code.