Clean up the argv splitter, and in particular stop it from bombing