XD-1109 Coerce command line options

Renames and use of comments for XD-707