XD-1109 Coerce command line options