Merge "Minor improvements on parseCommandArgs,"