Make both binaries support --help and --version correctly