More visitor cleanup + changes.