This PR also tweaks channel block headings to include the shorthand for each subsystem.
cc @thomas-massinger