Align left edge of description correctly in -h output

Always start the first word of the description in the same
column in the output, moving the first line of the description
down if necessary to provide a gap after the option syntax.

Also adapt to removal of += operator for ~str