use -DWANT_ARGV to enable this fix

(I really should make these fix flags on by default. Also vondehi really
 needs a cleanup now.)