Adjust cmdstruct:

- sort commands in alphabetical order: easier to reconcile with docs
- include the options for the command where not already included

NOTE: This makes some lines very long.  If that's not acceptable,
we'll have to look at this closer.