Polishing of visitors

This PR finished a TODO item.
Good catch, you are right!