Oops.. I broke argv parsing earlier.