Clean up bin/cjs-rename some more