Remove some unneccessary assignments to argc