Consolidate and fix the help (-h) output

(cherry picked from commit d38d8569bd53fe7d1d560d17eccd4e54af8a2d27)