Cleaned up command-line arg parsing.