Fix some warnings

Warnings were like 'Adapting argument list by creating a $N-tuple', with
$N varying depending on the situation.