Make subcommands render right in cli /help, and add test cases.