More changes to core visitor classes...