Made the argv/argc parsing a little nicer.