Refactor command-line help (#7157)