Mark up command line options

(This is a specific subset of the mixed changes in #403.)