diff --git a/token/cli/src/bench.rs b/token/cli/src/bench.rs
index 8d7d42860b3..c805b88fdc2 100644
--- a/token/cli/src/bench.rs
+++ b/token/cli/src/bench.rs
@@ -40,7 +40,7 @@ impl BenchSubCommand for App<'_> {
                         .about("Create multiple token accounts for benchmarking")
                         .arg(
                             Arg::with_name("token")
-                                .validator(is_valid_pubkey)
+                                .validator(|s| is_valid_pubkey(s))
                                 .value_name("TOKEN_ADDRESS")
                                 .takes_value(true)
                                 .index(1)
@@ -63,7 +63,7 @@ impl BenchSubCommand for App<'_> {
                         .about("Close multiple token accounts used for benchmarking")
                         .arg(
                             Arg::with_name("token")
-                                .validator(is_valid_pubkey)
+                                .validator(|s| is_valid_pubkey(s))
                                 .value_name("TOKEN_ADDRESS")
                                 .takes_value(true)
                                 .index(1)
@@ -86,7 +86,7 @@ impl BenchSubCommand for App<'_> {
                         .about("Deposit tokens into multiple accounts")
                         .arg(
                             Arg::with_name("token")
-                                .validator(is_valid_pubkey)
+                                .validator(|s| is_valid_pubkey(s))
                                 .value_name("TOKEN_ADDRESS")
                                 .takes_value(true)
                                 .index(1)
@@ -104,7 +104,7 @@ impl BenchSubCommand for App<'_> {
                         )
                         .arg(
                             Arg::with_name("amount")
-                                .validator(is_amount)
+                                .validator(|s| is_amount(s))
                                 .value_name("TOKEN_AMOUNT")
                                 .takes_value(true)
                                 .index(3)
@@ -114,7 +114,7 @@ impl BenchSubCommand for App<'_> {
                         .arg(
                             Arg::with_name("from")
                                 .long("from")
-                                .validator(is_valid_pubkey)
+                                .validator(|s| is_valid_pubkey(s))
                                 .value_name("SOURCE_TOKEN_ACCOUNT_ADDRESS")
                                 .takes_value(true)
                                 .help("The source token account address [default: associated token account for --owner]")
@@ -126,7 +126,7 @@ impl BenchSubCommand for App<'_> {
                         .about("Withdraw tokens from multiple accounts")
                         .arg(
                             Arg::with_name("token")
-                                .validator(is_valid_pubkey)
+                                .validator(|s| is_valid_pubkey(s))
                                 .value_name("TOKEN_ADDRESS")
                                 .takes_value(true)
                                 .index(1)
@@ -144,7 +144,7 @@ impl BenchSubCommand for App<'_> {
                         )
                         .arg(
                             Arg::with_name("amount")
-                                .validator(is_amount)
+                                .validator(|s| is_amount(s))
                                 .value_name("TOKEN_AMOUNT")
                                 .takes_value(true)
                                 .index(3)
@@ -154,7 +154,7 @@ impl BenchSubCommand for App<'_> {
                         .arg(
                             Arg::with_name("to")
                                 .long("to")
-                                .validator(is_valid_pubkey)
+                                .validator(|s| is_valid_pubkey(s))
                                 .value_name("RECIPIENT_TOKEN_ACCOUNT_ADDRESS")
                                 .takes_value(true)
                                 .help("The recipient token account address [default: associated token account for --owner]")
diff --git a/token/cli/src/main.rs b/token/cli/src/main.rs
index 46f500719cc..65fefe70529 100644
--- a/token/cli/src/main.rs
+++ b/token/cli/src/main.rs
@@ -211,7 +211,7 @@ pub fn owner_address_arg<'a, 'b>() -> Arg<'a, 'b> {
         .long(OWNER_ADDRESS_ARG.long)
         .takes_value(true)
         .value_name("OWNER_ADDRESS")
-        .validator(is_valid_pubkey)
+        .validator(|s| is_valid_pubkey(s))
         .help(OWNER_ADDRESS_ARG.help)
 }
 
@@ -220,7 +220,7 @@ pub fn owner_keypair_arg_with_value_name<'a>(value_name: &'static str) -> Arg<'a
         .long(OWNER_KEYPAIR_ARG.long)
         .takes_value(true)
         .value_name(value_name)
-        .validator(is_valid_signer)
+        .validator(|s| is_valid_signer(s))
         .help(OWNER_KEYPAIR_ARG.help)
 }
 
@@ -233,11 +233,11 @@ pub fn mint_address_arg<'a>() -> Arg<'a> {
         .long(MINT_ADDRESS_ARG.long)
         .takes_value(true)
         .value_name("MINT_ADDRESS")
-        .validator(is_valid_pubkey)
+        .validator(|s| is_valid_pubkey(s))
         .help(MINT_ADDRESS_ARG.help)
 }
 
-fn is_mint_decimals(string: String) -> Result<(), String> {
+fn is_mint_decimals(string: &str) -> Result<(), String> {
     is_parsable::<u8>(string)
 }
 
@@ -266,14 +266,14 @@ pub fn delegate_address_arg<'a>() -> Arg<'a> {
         .long(DELEGATE_ADDRESS_ARG.long)
         .takes_value(true)
         .value_name("DELEGATE_ADDRESS")
-        .validator(is_valid_pubkey)
+        .validator(|s| is_valid_pubkey(s))
         .help(DELEGATE_ADDRESS_ARG.help)
 }
 
 pub fn multisig_signer_arg<'a>() -> Arg<'a> {
     Arg::with_name(MULTISIG_SIGNER_ARG.name)
         .long(MULTISIG_SIGNER_ARG.long)
-        .validator(is_valid_signer)
+        .validator(|s| is_valid_signer(s))
         .value_name("MULTISIG_SIGNER")
         .takes_value(true)
         .multiple(true)
@@ -282,7 +282,7 @@ pub fn multisig_signer_arg<'a>() -> Arg<'a> {
         .help(MULTISIG_SIGNER_ARG.help)
 }
 
-fn is_multisig_minimum_signers(string: String) -> Result<(), String> {
+fn is_multisig_minimum_signers(string: &str) -> Result<(), String> {
     let v = u8::from_str(&string).map_err(|e| e.to_string())? as usize;
     if v < MIN_SIGNERS {
         Err(format!("must be at least {}", MIN_SIGNERS))
@@ -2794,7 +2794,7 @@ fn app<'a, 'b>(
                 .value_name("ADDRESS")
                 .takes_value(true)
                 .global(true)
-                .validator(is_valid_token_program_id)
+                .validator(|s| is_valid_token_program_id(s))
                 .help("SPL Token program id"),
         )
         .arg(
@@ -2804,7 +2804,7 @@ fn app<'a, 'b>(
                 .value_name("URL_OR_MONIKER")
                 .takes_value(true)
                 .global(true)
-                .validator(is_url_or_moniker)
+                .validator(|s| is_url_or_moniker(s))
                 .help(
                     "URL for Solana's JSON RPC or moniker (or their first letter): \
                        [mainnet-beta, testnet, devnet, localhost] \
@@ -2825,7 +2825,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("token_keypair")
                         .value_name("TOKEN_KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .index(1)
                         .help(
@@ -2839,7 +2839,7 @@ fn app<'a, 'b>(
                         .long("mint-authority")
                         .alias("owner")
                         .value_name("ADDRESS")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .takes_value(true)
                         .help(
                             "Specify the mint authority address. \
@@ -2968,7 +2968,7 @@ fn app<'a, 'b>(
                 .about("Set the interest rate for an interest-bearing token")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .required(true)
@@ -2984,7 +2984,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("rate_authority")
                     .long("rate-authority")
-                    .validator(is_valid_signer)
+                    .validator(|s| is_valid_signer(s))
                     .value_name("SIGNER")
                     .takes_value(true)
                     .help(
@@ -3137,7 +3137,7 @@ fn app<'a, 'b>(
                 .about("Create a new token account")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3147,7 +3147,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("account_keypair")
                         .value_name("ACCOUNT_KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .index(2)
                         .help(
@@ -3182,7 +3182,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("multisig_member")
                         .value_name("MULTISIG_MEMBER_PUBKEY")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .takes_value(true)
                         .index(2)
                         .required(true)
@@ -3194,7 +3194,7 @@ fn app<'a, 'b>(
                     Arg::with_name("address_keypair")
                         .long("address-keypair")
                         .value_name("ADDRESS_KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the address keypair. \
@@ -3209,7 +3209,7 @@ fn app<'a, 'b>(
                 .about("Authorize a new signing keypair to a token or token account")
                 .arg(
                     Arg::with_name("address")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3235,7 +3235,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("new_authority")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("AUTHORITY_ADDRESS")
                         .takes_value(true)
                         .index(3)
@@ -3247,7 +3247,7 @@ fn app<'a, 'b>(
                         .long("authority")
                         .alias("owner")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the current authority keypair. \
@@ -3276,7 +3276,7 @@ fn app<'a, 'b>(
                 .about("Transfer tokens between accounts")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3285,7 +3285,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("amount")
-                        .validator(is_amount_or_all)
+                        .validator(|s| is_amount_or_all(s))
                         .value_name("TOKEN_AMOUNT")
                         .takes_value(true)
                         .index(2)
@@ -3294,7 +3294,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("recipient")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("RECIPIENT_WALLET_ADDRESS or RECIPIENT_TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(3)
@@ -3305,7 +3305,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("from")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("SENDER_TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .long("from")
@@ -3368,7 +3368,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("expected_fee")
                         .long("expected-fee")
-                        .validator(is_amount)
+                        .validator(|s| is_amount(s))
                         .value_name("TOKEN_AMOUNT")
                         .takes_value(true)
                         .help("Expected fee amount collected during the transfer"),
@@ -3397,7 +3397,7 @@ fn app<'a, 'b>(
                 .about("Burn tokens from an account")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3406,7 +3406,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("amount")
-                        .validator(is_amount)
+                        .validator(|s| is_amount(s))
                         .value_name("TOKEN_AMOUNT")
                         .takes_value(true)
                         .index(2)
@@ -3431,7 +3431,7 @@ fn app<'a, 'b>(
                 .about("Mint new tokens")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3440,7 +3440,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("amount")
-                        .validator(is_amount)
+                        .validator(|s| is_amount(s))
                         .value_name("TOKEN_AMOUNT")
                         .takes_value(true)
                         .index(2)
@@ -3449,7 +3449,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("recipient")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("RECIPIENT_TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .conflicts_with("recipient_owner")
@@ -3460,7 +3460,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("recipient_owner")
                         .long("recipient-owner")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("RECIPIENT_WALLET_ADDRESS")
                         .takes_value(true)
                         .conflicts_with("recipient")
@@ -3471,7 +3471,7 @@ fn app<'a, 'b>(
                         .long("mint-authority")
                         .alias("owner")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the mint authority keypair. \
@@ -3490,7 +3490,7 @@ fn app<'a, 'b>(
                 .about("Freeze a token account")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3502,7 +3502,7 @@ fn app<'a, 'b>(
                         .long("freeze-authority")
                         .alias("owner")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the freeze authority keypair. \
@@ -3520,7 +3520,7 @@ fn app<'a, 'b>(
                 .about("Thaw a token account")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3532,7 +3532,7 @@ fn app<'a, 'b>(
                         .long("freeze-authority")
                         .alias("owner")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the freeze authority keypair. \
@@ -3550,7 +3550,7 @@ fn app<'a, 'b>(
                 .about("Wrap native SOL in a SOL token account")
                 .arg(
                     Arg::with_name("amount")
-                        .validator(is_amount)
+                        .validator(|s| is_amount(s))
                         .value_name("AMOUNT")
                         .takes_value(true)
                         .index(1)
@@ -3561,7 +3561,7 @@ fn app<'a, 'b>(
                     Arg::with_name("wallet_keypair")
                         .alias("owner")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the keypair for the wallet which will have its native SOL wrapped. \
@@ -3592,7 +3592,7 @@ fn app<'a, 'b>(
                 .about("Unwrap a SOL token account")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3603,7 +3603,7 @@ fn app<'a, 'b>(
                     Arg::with_name("wallet_keypair")
                         .alias("owner")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the keypair for the wallet which owns the wrapped SOL. \
@@ -3622,7 +3622,7 @@ fn app<'a, 'b>(
                 .about("Approve a delegate for a token account")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3631,7 +3631,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("amount")
-                        .validator(is_amount)
+                        .validator(|s| is_amount(s))
                         .value_name("TOKEN_AMOUNT")
                         .takes_value(true)
                         .index(2)
@@ -3640,7 +3640,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("delegate")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("DELEGATE_TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(3)
@@ -3660,7 +3660,7 @@ fn app<'a, 'b>(
                 .about("Revoke a delegate's authority")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3679,7 +3679,7 @@ fn app<'a, 'b>(
                 .about("Close a token account")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3690,7 +3690,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("recipient")
                         .long("recipient")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("REFUND_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .help("The address of the account to receive remaining SOL [default: --owner]"),
@@ -3700,7 +3700,7 @@ fn app<'a, 'b>(
                         .long("close-authority")
                         .alias("owner")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the token's close authority if it has one, \
@@ -3712,7 +3712,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("address")
                         .long("address")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .conflicts_with("token")
@@ -3728,7 +3728,7 @@ fn app<'a, 'b>(
                 .about("Close a token mint")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3738,7 +3738,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("recipient")
                         .long("recipient")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("REFUND_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .help("The address of the account to receive remaining SOL [default: --owner]"),
@@ -3747,7 +3747,7 @@ fn app<'a, 'b>(
                     Arg::with_name("close_authority")
                         .long("close-authority")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the token's close authority. \
@@ -3765,7 +3765,7 @@ fn app<'a, 'b>(
                 .about("Get token account balance")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3775,7 +3775,7 @@ fn app<'a, 'b>(
                 .arg(owner_address_arg().conflicts_with("address"))
                 .arg(
                     Arg::with_name("address")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .long("address")
@@ -3789,7 +3789,7 @@ fn app<'a, 'b>(
                 .about("Get token supply")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3802,7 +3802,7 @@ fn app<'a, 'b>(
                 .about("List all token accounts by owner")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3843,7 +3843,7 @@ fn app<'a, 'b>(
                 .about("Get wallet address")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .long("token")
@@ -3864,7 +3864,7 @@ fn app<'a, 'b>(
                 .setting(AppSettings::Hidden)
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3883,7 +3883,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("address")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .long("address")
@@ -3897,7 +3897,7 @@ fn app<'a, 'b>(
                 .setting(AppSettings::Hidden)
                 .arg(
                     Arg::with_name("address")
-                    .validator(is_valid_pubkey)
+                    .validator(|s| is_valid_pubkey(s))
                     .value_name("MULTISIG_ACCOUNT_ADDRESS")
                     .takes_value(true)
                     .index(1)
@@ -3910,7 +3910,7 @@ fn app<'a, 'b>(
                 .about("Query details of an SPL Token mint, account, or multisig by address")
                 .arg(
                     Arg::with_name("address")
-                    .validator(is_valid_pubkey)
+                    .validator(|s| is_valid_pubkey(s))
                     .value_name("TOKEN_ADDRESS")
                     .takes_value(true)
                     .index(1)
@@ -3942,7 +3942,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("address")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .long("address")
@@ -3955,7 +3955,7 @@ fn app<'a, 'b>(
                 .about("Enable required transfer memos for token account")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3973,7 +3973,7 @@ fn app<'a, 'b>(
                 .about("Disable required transfer memos for token account")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -3991,7 +3991,7 @@ fn app<'a, 'b>(
                 .about("Enable CPI Guard for token account")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -4009,7 +4009,7 @@ fn app<'a, 'b>(
                 .about("Disable CPI Guard for token account")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -4027,7 +4027,7 @@ fn app<'a, 'b>(
                 .about("Updates default account state for the mint. Requires the default account state extension.")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -4047,7 +4047,7 @@ fn app<'a, 'b>(
                     Arg::with_name("freeze_authority")
                         .long("freeze-authority")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the token's freeze authority. \
@@ -4108,7 +4108,7 @@ fn app<'a, 'b>(
                 .about("Withdraw withheld transfer fee tokens from mint and / or account(s)")
                 .arg(
                     Arg::with_name("account")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .index(1)
@@ -4117,7 +4117,7 @@ fn app<'a, 'b>(
                 )
                 .arg(
                     Arg::with_name("source")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("ACCOUNT_ADDRESS")
                         .takes_value(true)
                         .multiple(true)
@@ -4135,7 +4135,7 @@ fn app<'a, 'b>(
                         .long("withdraw-withheld-authority")
                         .alias("owner")
                         .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .help(
                             "Specify the withdraw withheld authority keypair. \
@@ -4151,7 +4151,7 @@ fn app<'a, 'b>(
                 .about("Set the transfer fee for a token with a configured transfer fee")
                 .arg(
                     Arg::with_name("token")
-                        .validator(is_valid_pubkey)
+                        .validator(|s| is_valid_pubkey(s))
                         .value_name("TOKEN_MINT_ADDRESS")
                         .takes_value(true)
                         .required(true)
@@ -4167,7 +4167,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("maximum_fee")
                         .value_name("TOKEN_AMOUNT")
-                        .validator(is_amount)
+                        .validator(|s| is_amount(s))
                         .takes_value(true)
                         .required(true)
                         .help("The new maximum transfer fee in UI amount"),
@@ -4175,7 +4175,7 @@ fn app<'a, 'b>(
                 .arg(
                     Arg::with_name("transfer_fee_authority")
                     .long("transfer-fee-authority")
-                    .validator(is_valid_signer)
+                    .validator(|s| is_valid_signer(s))
                     .value_name("SIGNER")
                     .takes_value(true)
                     .help(