Console help refactoring

Fixes #4535
Better way to do it?