I think you should adjust behaviour only on the number of actual arguments.