Updated for upcomming API change so --help and -help-cat hack no longer necessary.