diff --git a/src/assemblicon/cli.py b/src/assemblicon/cli.py
index 35019a2..3ef884a 100644
--- a/src/assemblicon/cli.py
+++ b/src/assemblicon/cli.py
@@ -112,7 +112,7 @@ def create_argparser(setup: StdOptsSetup) -> ArgumentParser:
         nargs="+",
         type=str,
         help="Only build given name represented jobs.",
-        metavar="RENDER",
+        metavar="JOB",
     )
     parser.add_argument(
         "-s",
@@ -120,9 +120,11 @@ def create_argparser(setup: StdOptsSetup) -> ArgumentParser:
         dest="svg_render",
         action="store",
         type=CliSvgRenderKind,
+        choices=list(CliSvgRenderKind),
         default=CliSvgRenderKind.Inkscape,
         help="The render used for rendering SVG into PNG.",
-        metavar="RENDER",
+        # YYC MARK: Disable for showing choices.
+        # metavar="RENDER",
     )
     parser.add_argument(
         "-f",
@@ -131,8 +133,10 @@ def create_argparser(setup: StdOptsSetup) -> ArgumentParser:
         action="extend",
         nargs="+",
         type=CliArtifactFormat,
+        choices=list(CliArtifactFormat),
         help="Only build artifacts of given formats. Repeatable. Default all formats.",
-        metavar="FORMAT",
+        # YYC MARK: Disable for showing choices.
+        # metavar="FORMAT", 
     )
     return parser