Group `--help` output by command type

A badly-coded (but working) implementation for #170.