Fixing argument-processing for windows CLI script