VarArity refactoring