core: fix help output option categorization

This fixes various mistakes with the organisation of help output.

Note, obviously maintaining separate heading systems for help output and GUI interfaces has its disadvantages; I have a set of further patches which merge the two, which will come later.

The first patch is the main one, encompassing the fixes. Two minor further tweaks accompany it.