Improve cli help formatting; isolate the hack for testing with dispatch