Polishing of visitors

This PR finished a TODO item.