Fix command-line argv handling.