Replace over-usages of *args with real parameters