Tweak argv handling.