Convert cmd_usage() calls in common to use a return value