Simplify Visitor#visit

All tests still pass.