REVIEW-1648 Moving forward with the refactorings in the command line args conversion (needed for REVIEW-1198).