Now we have a helper to dup the arguments, let's use it.
The code gains in clarity.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>