Fix cmd args with no-free-form transformer

Fix cmd args with no-free-form transformer #6120