Display help better

This PR probably fixes #6360.