Finally replaced TypeVisitor's @call array with specific args and variables