diff --git a/tools/tpm2_rc_decode.c b/tools/tpm2_rc_decode.c
@@ -244,7 +244,7 @@ static bool on_arg(int argc, char **argv) {
 
 bool tpm2_tool_onstart(tpm2_options **opts) {
 
-    *opts = tpm2_options_new(NULL, 0, NULL, NULL, on_arg, true);
+    *opts = tpm2_options_new(NULL, 0, NULL, NULL, on_arg, TPM2_OPTIONS_SHOW_USAGE);
 
     return *opts != NULL;
 }

diff --git a/tools/tpm2_readpublic.c b/tools/tpm2_readpublic.c
@@ -137,7 +137,7 @@ bool tpm2_tool_onstart(tpm2_options **opts) {
     };
 
     *opts = tpm2_options_new("H:o:c:f:", ARRAY_LEN(topts), topts,
-                             on_option, NULL, true);
+                             on_option, NULL, TPM2_OPTIONS_SHOW_USAGE);
 
     return *opts != NULL;
 }

diff --git a/tools/tpm2_rsadecrypt.c b/tools/tpm2_rsadecrypt.c
@@ -159,7 +159,7 @@ bool tpm2_tool_onstart(tpm2_options **opts) {
     };
 
     *opts = tpm2_options_new("k:P:I:o:c:S:", ARRAY_LEN(topts), topts,
-                             on_option, NULL, true);
+                             on_option, NULL, TPM2_OPTIONS_SHOW_USAGE);
 
     return *opts != NULL;
 }

diff --git a/tools/tpm2_rsaencrypt.c b/tools/tpm2_rsaencrypt.c
@@ -135,7 +135,7 @@ bool tpm2_tool_onstart(tpm2_options **opts) {
     };
 
     *opts = tpm2_options_new("k:o:c:", ARRAY_LEN(topts), topts,
-                             on_option, on_args, true);
+                             on_option, on_args, TPM2_OPTIONS_SHOW_USAGE);
 
     return *opts != NULL;
 }

diff --git a/tools/tpm2_send.c b/tools/tpm2_send.c
@@ -158,7 +158,7 @@ bool tpm2_tool_onstart(tpm2_options **opts) {
     };
 
     *opts = tpm2_options_new("o:", ARRAY_LEN(topts), topts,
-                             on_option, on_args, false);
+                             on_option, on_args, 0);
 
     ctx.input = stdin;
     ctx.output = stdout;

diff --git a/tools/tpm2_sign.c b/tools/tpm2_sign.c
@@ -285,7 +285,7 @@ bool tpm2_tool_onstart(tpm2_options **opts) {
     };
 
     *opts = tpm2_options_new("k:P:g:m:D:t:s:c:S:f:", ARRAY_LEN(topts), topts,
-                             on_option, NULL, true);
+                             on_option, NULL, TPM2_OPTIONS_SHOW_USAGE);
 
     return *opts != NULL;
 }

diff --git a/tools/tpm2_startauthsession.c b/tools/tpm2_startauthsession.c
@@ -95,7 +95,7 @@ bool tpm2_tool_onstart(tpm2_options **opts) {
     };
 
     *opts = tpm2_options_new("ag:S:", ARRAY_LEN(topts), topts, on_option,
-                             NULL, false);
+                             NULL, 0);
 
     return *opts != NULL;
 }

diff --git a/tools/tpm2_startup.c b/tools/tpm2_startup.c
@@ -71,7 +71,7 @@ bool tpm2_tool_onstart(tpm2_options **opts) {
     };
 
     *opts = tpm2_options_new("cs", ARRAY_LEN(topts), topts,
-                             on_option, NULL, false);
+                             on_option, NULL, 0);
 
     return *opts != NULL;
 }

diff --git a/tools/tpm2_tool.c b/tools/tpm2_tool.c
@@ -111,7 +111,7 @@ int main(int argc, char *argv[], char *envp[]) {
         }
     }
 
-    if (argc == 1 && tool_opts && tool_opts->show_usage) {
+    if (argc == 1 && tool_opts && (tool_opts->flags & TPM2_OPTIONS_SHOW_USAGE)) {
         tpm2_print_usage(argv[0], tool_opts);
         return ret;
     }

diff --git a/tools/tpm2_unseal.c b/tools/tpm2_unseal.c
@@ -218,7 +218,7 @@ bool tpm2_tool_onstart(tpm2_options **opts) {
     };
 
     *opts = tpm2_options_new("H:P:o:c:S:L:F:", ARRAY_LEN(topts), topts,
-                             on_option, NULL, true);
+                             on_option, NULL, TPM2_OPTIONS_SHOW_USAGE);
 
     return *opts != NULL;
 }

diff --git a/tools/tpm2_verifysignature.c b/tools/tpm2_verifysignature.c
@@ -267,7 +267,7 @@ bool tpm2_tool_onstart(tpm2_options **opts) {
 
 
     *opts = tpm2_options_new("k:g:m:D:rs:t:c:", ARRAY_LEN(topts), topts,
-                             on_option, NULL, true);
+                             on_option, NULL, TPM2_OPTIONS_SHOW_USAGE);
 
     return *opts != NULL;
 }