Update usage messages

Various flags were missing from usage messages across the system; `-g`
and `-s` were the most notable ones. Add them to the appropriate usage
messages.

Spotted by Christopher Koch.