Console help refactoring

Fixes #4535
yes