Remove current visitor instance var

@knowuh this request isn't quite done yet, but I wanted to start this pull request so I can review it easier. I'll send a ping when it is ready to go.