Cleanup invocations of trait callees
Change visitor to use &TyVisitor