XD-1109b: cmd line coercion2

You'll want to rebase / cherry pick 	b085bda