The existing code for the --help options is, IMO, a bit of an eyesore in places, with very long lines and some strange concatenation. This PR is an attempt to clean this up. I targeted a line-length of 90-100 characters.
There are a lot of changes here, but should be no functionality changes (output tested as identical).