Adjust to periga-argv 0.46