mapreduce: Improved command line options