Fixed arg parsing such that none values or optional arguments are handled properly.