Enhanced parse-argv support a little bit.