Bring new baseline generator to parity with cscript support