Fix trap_Argc/Argv for client commands