Tweak CLI command completion and some help text. (issue #10049 reported by IgorG)