Convert translatable string construction in enums to positional args only (e1e0c1a) - derivepassphrase.git

@@ -398,7 +398,7 @@ class TranslatableString(NamedTuple):
 def translatable(
     context: str,
     single: str,
-    # /,
+    /,
     flags: Iterable[str] = (),
     plural: str = '',
     comments: str = '',
@@ -517,7 +517,7 @@ class _TranslatedStringConstructor(Protocol):
         self,
         context: str,
         single: str,
-        # /,
+        /,
         flags: Iterable[str] = (),
         plural: str = '',
         comments: str = '',
@@ -526,7 +526,7 @@ class _TranslatedStringConstructor(Protocol):
 
 def _Commented(  # noqa: N802
     comments: str = '',
-    # /
+    /
 ) -> _TranslatedStringConstructor:
     """A "decorator" for readably constructing commented enum values.
 
@@ -545,126 +545,125 @@ def _Commented(  # noqa: N802
 
 class Label(enum.Enum):
     DEPRECATION_WARNING_LABEL = _Commented(
-        comments='This is a short label that will be prepended to '
+        'This is a short label that will be prepended to '
         'a warning message, e.g., "Deprecation warning: A subcommand '
         'will be required in v1.0."',
     )(
-        context='Label :: Diagnostics :: Marker',
-        single='Deprecation warning',
+        'Label :: Diagnostics :: Marker',
+        'Deprecation warning',
     )
     WARNING_LABEL = _Commented(
-        comments='This is a short label that will be prepended to '
+        'This is a short label that will be prepended to '
         'a warning message, e.g., "Warning: An empty service name '
         'is not supported by vault(1)."',
     )(
-        context='Label :: Diagnostics :: Marker',
-        single='Warning',
+        'Label :: Diagnostics :: Marker',
+        'Warning',
     )
     CANNOT_UPDATE_SETTINGS_METAVAR_SETTINGS_TYPE_GLOBAL = (
         _Commented(
-            comments='This is one of two values of the settings_type metavar '
+            'This is one of two values of the settings_type metavar '
             'used in the CANNOT_UPDATE_SETTINGS_NO_SETTINGS entry.  '
             'It is only used there.  '
             'The full sentence then reads: '
             '"Cannot update the global settings without any given settings."',
         )(
-            context='Label :: Error message :: Metavar',
-            single='global settings',
+            'Label :: Error message :: Metavar',
+            'global settings',
         )
     )
     CANNOT_UPDATE_SETTINGS_METAVAR_SETTINGS_TYPE_SERVICE = (
         _Commented(
-            comments='This is one of two values of the settings_type metavar '
+            'This is one of two values of the settings_type metavar '
             'used in the CANNOT_UPDATE_SETTINGS_NO_SETTINGS entry.  '
             'It is only used there.  '
             'The full sentence then reads: '
             '"Cannot update the service-specific settings without any '
             'given settings."',
         )(
-            context='Label :: Error message :: Metavar',
-            single='service-specific settings',
+            'Label :: Error message :: Metavar',
+            'service-specific settings',
         )
     )
     DERIVEPASSPHRASE_01 = _Commented(
-        comments='This is the first paragraph of the command help text, '
+        'This is the first paragraph of the command help text, '
         'but it also appears (in truncated form, if necessary) '
         'as one-line help text for this command.  '
         'The translation should thus be as meaningful as possible '
         'even if truncated.',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Derive a strong passphrase, deterministically, '
-        'from a master secret.',
+        'Label :: Help text :: Explanation',
+        'Derive a strong passphrase, deterministically, from a master secret.',
     )
     DERIVEPASSPHRASE_02 = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='The currently implemented subcommands are "vault" '
+        'Label :: Help text :: Explanation',
+        'The currently implemented subcommands are "vault" '
         '(for the scheme used by vault) and "export" '
         '(for exporting foreign configuration data).  '
         'See the respective `--help` output for instructions.  '
         'If no subcommand is given, we default to "vault".',
     )
     DERIVEPASSPHRASE_03 = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Deprecation notice: Defaulting to "vault" is deprecated.  '
+        'Label :: Help text :: Explanation',
+        'Deprecation notice: Defaulting to "vault" is deprecated.  '
         'Starting in v1.0, the subcommand must be specified explicitly.',
     )
     DERIVEPASSPHRASE_EPILOG_01 = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Configuration is stored in a directory according to the '
+        'Label :: Help text :: Explanation',
+        'Configuration is stored in a directory according to the '
         '`DERIVEPASSPHRASE_PATH` variable, which defaults to '
         '`~/.derivepassphrase` on UNIX-like systems and '
         r'`C:\Users\<user>\AppData\Roaming\Derivepassphrase` on Windows.',
     )
     DERIVEPASSPHRASE_EXPORT_01 = _Commented(
-        comments='This is the first paragraph of the command help text, '
+        'This is the first paragraph of the command help text, '
         'but it also appears (in truncated form, if necessary) '
         'as one-line help text for this command.  '
         'The translation should thus be as meaningful as possible '
         'even if truncated.',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Export a foreign configuration to standard output.',
+        'Label :: Help text :: Explanation',
+        'Export a foreign configuration to standard output.',
     )
     DERIVEPASSPHRASE_EXPORT_02 = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='The only available subcommand is "vault", '
+        'Label :: Help text :: Explanation',
+        'The only available subcommand is "vault", '
         'which implements the vault-native configuration scheme.  '
         'If no subcommand is given, we default to "vault".',
     )
     DERIVEPASSPHRASE_EXPORT_03 = DERIVEPASSPHRASE_03
     DERIVEPASSPHRASE_EXPORT_VAULT_01 = _Commented(
-        comments='This is the first paragraph of the command help text, '
+        'This is the first paragraph of the command help text, '
         'but it also appears (in truncated form, if necessary) '
         'as one-line help text for this command.  '
         'The translation should thus be as meaningful as possible '
         'even if truncated.',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Export a vault-native configuration to standard output.',
+        'Label :: Help text :: Explanation',
+        'Export a vault-native configuration to standard output.',
     )
     DERIVEPASSPHRASE_EXPORT_VAULT_02 = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Depending on the configuration format, '
+        'Label :: Help text :: Explanation',
+        'Depending on the configuration format, '
         '{path_metavar!s} may either be a file or a directory.  '
         'We support the vault "v0.2", "v0.3" and "storeroom" formats.',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_EXPORT_VAULT_03 = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='If {path_metavar!s} is explicitly given as `VAULT_PATH`, '
+        'Label :: Help text :: Explanation',
+        'If {path_metavar!s} is explicitly given as `VAULT_PATH`, '
         'then use the `VAULT_PATH` environment variable to '
         'determine the correct path.  '
         '(Use `./VAULT_PATH` or similar to indicate a file/directory '
@@ -672,29 +671,29 @@ class Label(enum.Enum):
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_01 = _Commented(
-        comments='This is the first paragraph of the command help text, '
+        'This is the first paragraph of the command help text, '
         'but it also appears (in truncated form, if necessary) '
         'as one-line help text for this command.  '
         'The translation should thus be as meaningful as possible '
         'even if truncated.',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Derive a passphrase using the vault derivation scheme.',
+        'Label :: Help text :: Explanation',
+        'Derive a passphrase using the vault derivation scheme.',
     )
     DERIVEPASSPHRASE_VAULT_02 = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='If operating on global settings, or importing/exporting settings, '
+        'Label :: Help text :: Explanation',
+        'If operating on global settings, or importing/exporting settings, '
         'then {service_metavar!s} must be omitted.  '
         'Otherwise it is required.',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_EPILOG_01 = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='WARNING: There is NO WAY to retrieve the generated passphrases '
+        'Label :: Help text :: Explanation',
+        'WARNING: There is NO WAY to retrieve the generated passphrases '
         'if the master passphrase, the SSH key, or the exact '
         'passphrase settings are lost, '
         'short of trying out all possible combinations.  '
@@ -702,387 +701,387 @@ class Label(enum.Enum):
         'the settings and the SSH key, if any.',
     )
     DERIVEPASSPHRASE_VAULT_EPILOG_02 = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='The configuration is NOT encrypted, and you are '
+        'Label :: Help text :: Explanation',
+        'The configuration is NOT encrypted, and you are '
         'STRONGLY discouraged from using a stored passphrase.',
     )
     DEPRECATED_COMMAND_LABEL = _Commented(
-        comments='We use this format string to indicate, at the beginning '
+        'We use this format string to indicate, at the beginning '
         "of a command's help text, that this command is deprecated.",
     )(
-        context='Label :: Help text :: Marker',
-        single='(Deprecated) {text}',
+        'Label :: Help text :: Marker',
+        '(Deprecated) {text}',
         flags='python-brace-format',
     )
     DEBUG_OPTION_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='also emit debug information (implies --verbose)',
+        'Label :: Help text :: One-line description',
+        'also emit debug information (implies --verbose)',
     )
     EXPORT_VAULT_FORMAT_HELP_TEXT = _Commented(
-        comments='The defaults_hint is Label.EXPORT_VAULT_FORMAT_DEFAULTS_HELP_TEXT, '
+        'The defaults_hint is Label.EXPORT_VAULT_FORMAT_DEFAULTS_HELP_TEXT, '
         'the metavar is Label.EXPORT_VAULT_FORMAT_METAVAR_FMT.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='try the following storage format {metavar!s}; '
+        'Label :: Help text :: One-line description',
+        'try the following storage format {metavar!s}; '
         'may be specified multiple times, '
         'formats will be tried in order {defaults_hint!s}',
         flags='python-brace-format',
     )
     EXPORT_VAULT_FORMAT_DEFAULTS_HELP_TEXT = _Commented(
-        comments='See EXPORT_VAULT_FORMAT_HELP_TEXT.  '
+        'See EXPORT_VAULT_FORMAT_HELP_TEXT.  '
         'The format names/labels "v0.3", "v0.2" and "storeroom" '
         'should not be translated.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='(default: v0.3, v0.2, storeroom)',
+        'Label :: Help text :: One-line description',
+        '(default: v0.3, v0.2, storeroom)',
     )
     EXPORT_VAULT_KEY_HELP_TEXT = _Commented(
-        comments='The defaults_hint is Label.EXPORT_VAULT_KEY_DEFAULTS_HELP_TEXT, '
+        'The defaults_hint is Label.EXPORT_VAULT_KEY_DEFAULTS_HELP_TEXT, '
         'the metavar is Label.EXPORT_VAULT_KEY_METAVAR_K.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='use {metavar!s} as the storage master key {defaults_hint!s}',
+        'Label :: Help text :: One-line description',
+        'use {metavar!s} as the storage master key {defaults_hint!s}',
         flags='python-brace-format',
     )
     EXPORT_VAULT_KEY_DEFAULTS_HELP_TEXT = _Commented(
-        comments='See EXPORT_VAULT_KEY_HELP_TEXT.',
+        'See EXPORT_VAULT_KEY_HELP_TEXT.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='(default: check the `VAULT_KEY`, `LOGNAME`, `USER`, or '
+        'Label :: Help text :: One-line description',
+        '(default: check the `VAULT_KEY`, `LOGNAME`, `USER`, or '
         '`USERNAME` environment variables)',
     )
     HELP_OPTION_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='show this help text, then exit',
+        'Label :: Help text :: One-line description',
+        'show this help text, then exit',
     )
     QUIET_OPTION_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='suppress even warnings, emit only errors',
+        'Label :: Help text :: One-line description',
+        'suppress even warnings, emit only errors',
     )
     VERBOSE_OPTION_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='emit extra/progress information to standard error',
+        'Label :: Help text :: One-line description',
+        'emit extra/progress information to standard error',
     )
     VERSION_OPTION_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='show applicable version information, then exit',
+        'Label :: Help text :: One-line description',
+        'show applicable version information, then exit',
     )
 
     DERIVEPASSPHRASE_VAULT_PHRASE_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='prompt for a master passphrase',
+        'Label :: Help text :: One-line description',
+        'prompt for a master passphrase',
     )
     DERIVEPASSPHRASE_VAULT_KEY_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='select a suitable SSH key from the SSH agent',
+        'Label :: Help text :: One-line description',
+        'select a suitable SSH key from the SSH agent',
     )
     DERIVEPASSPHRASE_VAULT_LENGTH_HELP_TEXT = _Commented(
-        comments='The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
+        'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='ensure a passphrase length of {metavar!s} characters',
+        'Label :: Help text :: One-line description',
+        'ensure a passphrase length of {metavar!s} characters',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_REPEAT_HELP_TEXT = _Commented(
-        comments='The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
+        'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='forbid any run of {metavar!s} identical characters',
+        'Label :: Help text :: One-line description',
+        'forbid any run of {metavar!s} identical characters',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_LOWER_HELP_TEXT = _Commented(
-        comments='The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
+        'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='ensure at least {metavar!s} lowercase characters',
+        'Label :: Help text :: One-line description',
+        'ensure at least {metavar!s} lowercase characters',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_UPPER_HELP_TEXT = _Commented(
-        comments='The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
+        'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='ensure at least {metavar!s} uppercase characters',
+        'Label :: Help text :: One-line description',
+        'ensure at least {metavar!s} uppercase characters',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_NUMBER_HELP_TEXT = _Commented(
-        comments='The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
+        'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='ensure at least {metavar!s} digits',
+        'Label :: Help text :: One-line description',
+        'ensure at least {metavar!s} digits',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_SPACE_HELP_TEXT = _Commented(
-        comments='The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
+        'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='ensure at least {metavar!s} spaces',
+        'Label :: Help text :: One-line description',
+        'ensure at least {metavar!s} spaces',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_DASH_HELP_TEXT = _Commented(
-        comments='The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
+        'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='ensure at least {metavar!s} "-" or "_" characters',
+        'Label :: Help text :: One-line description',
+        'ensure at least {metavar!s} "-" or "_" characters',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_SYMBOL_HELP_TEXT = _Commented(
-        comments='The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
+        'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='ensure at least {metavar!s} symbol characters',
+        'Label :: Help text :: One-line description',
+        'ensure at least {metavar!s} symbol characters',
         flags='python-brace-format',
     )
 
     DERIVEPASSPHRASE_VAULT_NOTES_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='spawn an editor to edit notes for {service_metavar!s}',
+        'Label :: Help text :: One-line description',
+        'spawn an editor to edit notes for {service_metavar!s}',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_CONFIG_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='save the given settings for {service_metavar!s}, or global',
+        'Label :: Help text :: One-line description',
+        'save the given settings for {service_metavar!s}, or global',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_DELETE_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='delete the settings for {service_metavar!s}',
+        'Label :: Help text :: One-line description',
+        'delete the settings for {service_metavar!s}',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_DELETE_GLOBALS_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='delete the global settings',
+        'Label :: Help text :: One-line description',
+        'delete the global settings',
     )
     DERIVEPASSPHRASE_VAULT_DELETE_ALL_HELP_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: One-line description',
-        single='delete all settings',
+        'Label :: Help text :: One-line description',
+        'delete all settings',
     )
     DERIVEPASSPHRASE_VAULT_EXPORT_HELP_TEXT = _Commented(
-        comments='The metavar is Label.STORAGE_MANAGEMENT_METAVAR_SERVICE.',
+        'The metavar is Label.STORAGE_MANAGEMENT_METAVAR_SERVICE.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='export all saved settings to {metavar!s}',
+        'Label :: Help text :: One-line description',
+        'export all saved settings to {metavar!s}',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_IMPORT_HELP_TEXT = _Commented(
-        comments='The metavar is Label.STORAGE_MANAGEMENT_METAVAR_SERVICE.',
+        'The metavar is Label.STORAGE_MANAGEMENT_METAVAR_SERVICE.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='import saved settings from {metavar!s}',
+        'Label :: Help text :: One-line description',
+        'import saved settings from {metavar!s}',
         flags='python-brace-format',
     )
     DERIVEPASSPHRASE_VAULT_OVERWRITE_HELP_TEXT = _Commented(
-        comments='The corresponding option is displayed as '
+        'The corresponding option is displayed as '
         '"--overwrite-existing / --merge-existing", so you may want to '
         'hint that the default (merge) is the second of those options.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='overwrite or merge (default) the existing configuration',
+        'Label :: Help text :: One-line description',
+        'overwrite or merge (default) the existing configuration',
     )
     DERIVEPASSPHRASE_VAULT_UNSET_HELP_TEXT = _Commented(
-        comments='The corresponding option is displayed as '
+        'The corresponding option is displayed as '
         '"--unset=phrase|key|...|symbol", so the "given setting" is '
         'referring to "phrase", "key", "lower", ..., or "symbol", '
         'respectively.  '
         '"with --config" here means that the user must also specify '
         '"--config" for this option to have any effect.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='with --config, also unsets the given setting; '
+        'Label :: Help text :: One-line description',
+        'with --config, also unsets the given setting; '
         'may be specified multiple times',
     )
     DERIVEPASSPHRASE_VAULT_EXPORT_AS_HELP_TEXT = _Commented(
-        comments='The corresponding option is displayed as '
+        'The corresponding option is displayed as '
         '"--export-as=json|sh", so json refers to the JSON format (default) '
         'and sh refers to the POSIX sh format.',
     )(
-        context='Label :: Help text :: One-line description',
-        single='when exporting, export as JSON (default) or POSIX sh',
+        'Label :: Help text :: One-line description',
+        'when exporting, export as JSON (default) or POSIX sh',
     )
 
     EXPORT_VAULT_FORMAT_METAVAR_FMT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Metavar :: export vault',
-        single='FMT',
+        'Label :: Help text :: Metavar :: export vault',
+        'FMT',
     )
     EXPORT_VAULT_KEY_METAVAR_K = _Commented(
-        comments='See Label.EXPORT_VAULT_KEY_HELP_TEXT.',
+        'See Label.EXPORT_VAULT_KEY_HELP_TEXT.',
     )(
-        context='Label :: Help text :: Metavar :: export vault',
-        single='K',
+        'Label :: Help text :: Metavar :: export vault',
+        'K',
     )
     EXPORT_VAULT_METAVAR_PATH = _Commented(
-        comments='Used as "path_metavar" in '
+        'Used as "path_metavar" in '
         'Label.DERIVEPASSPHRASE_EXPORT_VAULT_02 and others.',
     )(
-        context='Label :: Help text :: Metavar :: export vault',
-        single='PATH',
+        'Label :: Help text :: Metavar :: export vault',
+        'PATH',
     )
     PASSPHRASE_GENERATION_METAVAR_NUMBER = _Commented(
-        comments='This metavar is also used in a matching epilog.',
+        'This metavar is also used in a matching epilog.',
     )(
-        context='Label :: Help text :: Metavar :: vault',
-        single='NUMBER',
+        'Label :: Help text :: Metavar :: vault',
+        'NUMBER',
     )
     STORAGE_MANAGEMENT_METAVAR_PATH = _Commented(
-        comments='This metavar is also used in multiple one-line help texts.',
+        'This metavar is also used in multiple one-line help texts.',
     )(
-        context='Label :: Help text :: Metavar :: vault',
-        single='PATH',
+        'Label :: Help text :: Metavar :: vault',
+        'PATH',
     )
     VAULT_METAVAR_SERVICE = _Commented(
-        comments='This metavar is also used in multiple one-line help texts.',
+        'This metavar is also used in multiple one-line help texts.',
     )(
-        context='Label :: Help text :: Metavar :: vault',
-        single='SERVICE',
+        'Label :: Help text :: Metavar :: vault',
+        'SERVICE',
     )
     CONFIGURATION_EPILOG = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Use $VISUAL or $EDITOR to configure the spawned editor.',
+        'Label :: Help text :: Explanation',
+        'Use $VISUAL or $EDITOR to configure the spawned editor.',
     )
     PASSPHRASE_GENERATION_EPILOG = _Commented(
-        comments='The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
+        'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Use {metavar!s}=0 to exclude a character type from the output.',
+        'Label :: Help text :: Explanation',
+        'Use {metavar!s}=0 to exclude a character type from the output.',
         flags='python-brace-format',
     )
     STORAGE_MANAGEMENT_EPILOG = _Commented(
-        comments='The metavar is Label.STORAGE_MANAGEMENT_METAVAR_PATH.',
+        'The metavar is Label.STORAGE_MANAGEMENT_METAVAR_PATH.',
     )(
-        context='Label :: Help text :: Explanation',
-        single='Using "-" as {metavar!s} for standard input/standard output '
+        'Label :: Help text :: Explanation',
+        'Using "-" as {metavar!s} for standard input/standard output '
         'is supported.',
         flags='python-brace-format',
     )
     COMMANDS_LABEL = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Option group name',
-        single='Commands',
+        'Label :: Help text :: Option group name',
+        'Commands',
     )
     COMPATIBILITY_OPTION_LABEL = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Option group name',
-        single='Compatibility and extension options',
+        'Label :: Help text :: Option group name',
+        'Compatibility and extension options',
     )
     CONFIGURATION_LABEL = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Option group name',
-        single='Configuration',
+        'Label :: Help text :: Option group name',
+        'Configuration',
     )
     LOGGING_LABEL = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Option group name',
-        single='Logging',
+        'Label :: Help text :: Option group name',
+        'Logging',
     )
     OPTIONS_LABEL = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Option group name',
-        single='Options',
+        'Label :: Help text :: Option group name',
+        'Options',
     )
     OTHER_OPTIONS_LABEL = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Option group name',
-        single='Other options',
+        'Label :: Help text :: Option group name',
+        'Other options',
     )
     PASSPHRASE_GENERATION_LABEL = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Option group name',
-        single='Passphrase generation',
+        'Label :: Help text :: Option group name',
+        'Passphrase generation',
     )
     STORAGE_MANAGEMENT_LABEL = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Help text :: Option group name',
-        single='Storage management',
+        'Label :: Help text :: Option group name',
+        'Storage management',
     )
     VERSION_INFO_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Info Message',
-        single='{PROG_NAME!s} {__version__}',  # noqa: RUF027
+        'Label :: Info Message',
+        '{PROG_NAME!s} {__version__}',  # noqa: RUF027
         flags='python-brace-format',
     )
     CONFIRM_THIS_CHOICE_PROMPT_TEXT = _Commented(
-        comments='There is no support for "yes" or "no" in other languages '
+        'There is no support for "yes" or "no" in other languages '
         'than English, so it is advised that your translation makes it '
         'clear that only the strings "y", "yes", "n" or "no" are supported, '
         'even if the prompt becomes a bit longer.',
     )(
-        context='Label :: Interactive prompt',
-        single='Confirm this choice? (y/N)',
+        'Label :: Interactive prompt',
+        'Confirm this choice? (y/N)',
     )
     SUITABLE_SSH_KEYS_LABEL = _Commented(
-        comments='This label is the heading of the list of suitable SSH keys.',
+        'This label is the heading of the list of suitable SSH keys.',
     )(
-        context='Label :: Interactive prompt',
-        single='Suitable SSH keys:',
+        'Label :: Interactive prompt',
+        'Suitable SSH keys:',
     )
     YOUR_SELECTION_PROMPT_TEXT = _Commented(
-        comments='',
+        '',
     )(
-        context='Label :: Interactive prompt',
-        single='Your selection? (1-{n}, leave empty to abort)',
+        'Label :: Interactive prompt',
+        'Your selection? (1-{n}, leave empty to abort)',
         flags='python-brace-format',
     )
 
 
 class DebugMsgTemplate(enum.Enum):
     BUCKET_ITEM_FOUND = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "storeroom"-type configuration directories.  '
         'The system stores entries in different "buckets" of a hash table.  '
         'Here, we report on a single item (path and value) we discovered '
         'after decrypting the whole bucket.  '
         '(We ensure the path and value are printable as-is.)',
     )(
-        context='Debug message',
-        single='Found bucket item: {path} -> {value}',
+        'Debug message',
+        'Found bucket item: {path} -> {value}',
         flags='python-brace-format',
     )
     DECRYPT_BUCKET_ITEM_INFO = _Commented(
-        comments='"AES256-CBC" and "PKCS#7" are, in essence, names of formats, '
+        '"AES256-CBC" and "PKCS#7" are, in essence, names of formats, '
         'and should not be translated.  '
         '"IV" means "initialization vector", and is specifically '
         'a cryptographic term, as are "plaintext" and "ciphertext".',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Decrypt bucket item contents:
 
   \b
@@ -1095,10 +1094,10 @@ Decrypt bucket item contents:
         flags='python-brace-format',
     )
     DECRYPT_BUCKET_ITEM_KEY_INFO = _Commented(
-        comments='',
+        '',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Decrypt bucket item:
 
   \b
@@ -1109,7 +1108,7 @@ Decrypt bucket item:
         flags='python-brace-format',
     )
     DECRYPT_BUCKET_ITEM_MAC_INFO = _Commented(
-        comments='The MAC stands for "message authentication code", '
+        'The MAC stands for "message authentication code", '
         'which guarantees the authenticity of the message to anyone '
         'who holds the corresponding key, similar to a digital signature.  '
         'The acronym "MAC" is assumed to be well-known to the '
@@ -1118,8 +1117,8 @@ Decrypt bucket item:
         'Please use your judgement as to whether to translate this term '
         'or not, expanded or not.',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Decrypt bucket item contents:
 
   \b
@@ -1131,13 +1130,13 @@ Decrypt bucket item contents:
         flags='python-brace-format',
     )
     DECRYPT_BUCKET_ITEM_SESSION_KEYS_INFO = _Commented(
-        comments='"AES256-CBC" and "PKCS#7" are, in essence, names of formats, '
+        '"AES256-CBC" and "PKCS#7" are, in essence, names of formats, '
         'and should not be translated.  '
         '"IV" means "initialization vector", and is specifically '
         'a cryptographic term, as are "plaintext" and "ciphertext".',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Decrypt bucket item session keys:
 
   \b
@@ -1151,7 +1150,7 @@ Decrypt bucket item session keys:
         flags='python-brace-format',
     )
     DECRYPT_BUCKET_ITEM_SESSION_KEYS_MAC_INFO = _Commented(
-        comments='The MAC stands for "message authentication code", '
+        'The MAC stands for "message authentication code", '
         'which guarantees the authenticity of the message to anyone '
         'who holds the corresponding key, similar to a digital signature.  '
         'The acronym "MAC" is assumed to be well-known to the '
@@ -1160,8 +1159,8 @@ Decrypt bucket item session keys:
         'Please use your judgement as to whether to translate this term '
         'or not, expanded or not.',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Decrypt bucket item session keys:
 
   \b
@@ -1173,10 +1172,10 @@ Decrypt bucket item session keys:
         flags='python-brace-format',
     )
     DERIVED_MASTER_KEYS_KEYS = _Commented(
-        comments='',
+        '',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Derived master keys' keys:
 
   \b
@@ -1188,7 +1187,7 @@ Derived master keys' keys:
         flags='python-brace-format',
     )
     DIRECTORY_CONTENTS_CHECK_OK = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "storeroom"-type configuration directories, '
         'while "assembling" the items stored in the configuration '
         """according to the item's "path".  """
@@ -1198,12 +1197,12 @@ Derived master keys' keys:
         'Now, at the end, we actually confirm the claim.  '
         '(We would have already thrown an error here otherwise.)',
     )(
-        context='Debug message',
-        single='Directory contents check OK: {path} -> {contents}',
+        'Debug message',
+        'Directory contents check OK: {path} -> {contents}',
         flags='python-brace-format',
     )
     MASTER_KEYS_DATA_MAC_INFO = _Commented(
-        comments='The MAC stands for "message authentication code", '
+        'The MAC stands for "message authentication code", '
         'which guarantees the authenticity of the message to anyone '
         'who holds the corresponding key, similar to a digital signature.  '
         'The acronym "MAC" is assumed to be well-known to the '
@@ -1212,8 +1211,8 @@ Derived master keys' keys:
         'Please use your judgement as to whether to translate this term '
         'or not, expanded or not.',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Master keys data:
 
   \b
@@ -1225,7 +1224,7 @@ Master keys data:
         flags='python-brace-format',
     )
     POSTPONING_DIRECTORY_CONTENTS_CHECK = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "storeroom"-type configuration directories, '
         'while "assembling" the items stored in the configuration '
         """according to the item's "path".  """
@@ -1235,44 +1234,44 @@ Master keys data:
         'When emitting this message, we merely indicate that we saved '
         'the "claimed" list for this directory for later.',
     )(
-        context='Debug message',
-        single='Postponing directory contents check: {path} -> {contents}',
+        'Debug message',
+        'Postponing directory contents check: {path} -> {contents}',
         flags='python-brace-format',
     )
     SETTING_CONFIG_STRUCTURE_CONTENTS = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "storeroom"-type configuration directories, '
         'while "assembling" the items stored in the configuration '
         """according to the item's "path".  """
         'We confirm that we set the entry at the given path '
         'to the given value.',
     )(
-        context='Debug message',
-        single='Setting contents: {path} -> {value}',
+        'Debug message',
+        'Setting contents: {path} -> {value}',
         flags='python-brace-format',
     )
     SETTING_CONFIG_STRUCTURE_CONTENTS_EMPTY_DIRECTORY = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "storeroom"-type configuration directories, '
         'while "assembling" the items stored in the configuration '
         """according to the item's "path".  """
         'We confirm that we set up a currently empty directory '
         'at the given path.',
     )(
-        context='Debug message',
-        single='Setting contents (empty directory): {path}',
+        'Debug message',
+        'Setting contents (empty directory): {path}',
         flags='python-brace-format',
     )
     VAULT_NATIVE_EVP_BYTESTOKEY_INIT = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "native"-type configuration directories: '
         'in v0.2, the non-standard and deprecated "EVP_bytestokey" function '
         'from OpenSSL must be reimplemented from scratch.  '
         'The terms "salt" and "IV" (initialization vector) '
         'are cryptographic terms.',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 evp_bytestokey_md5 (initialization):
 
   \b
@@ -1286,7 +1285,7 @@ evp_bytestokey_md5 (initialization):
         flags='python-brace-format',
     )
     VAULT_NATIVE_EVP_BYTESTOKEY_RESULT = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "native"-type configuration directories: '
         'in v0.2, the non-standard and deprecated "EVP_bytestokey" function '
         'from OpenSSL must be reimplemented from scratch.  '
@@ -1294,8 +1293,8 @@ evp_bytestokey_md5 (initialization):
         'are cryptographic terms.'
         'This function reports on the final results.',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 evp_bytestokey_md5 (result):
 
   \b
@@ -1305,7 +1304,7 @@ evp_bytestokey_md5 (result):
         flags='python-brace-format',
     )
     VAULT_NATIVE_EVP_BYTESTOKEY_ROUND = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "native"-type configuration directories: '
         'in v0.2, the non-standard and deprecated "EVP_bytestokey" function '
         'from OpenSSL must be reimplemented from scratch.  '
@@ -1314,8 +1313,8 @@ evp_bytestokey_md5 (result):
         'This function reports on the updated buffer length and contents '
         'after executing one round of hashing.',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 evp_bytestokey_md5 (round update):
 
   \b
@@ -1325,14 +1324,14 @@ evp_bytestokey_md5 (round update):
         flags='python-brace-format',
     )
     VAULT_NATIVE_CHECKING_MAC_DETAILS = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "native"-type configuration directories.  '
         'It is preceded by the info message '
         'VAULT_NATIVE_PARSING_IV_PAYLOAD_MAC; see the commentary there '
         'concerning the terms and thoughts on translating them.',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 MAC details:
 
   \b
@@ -1342,23 +1341,23 @@ MAC details:
         flags='python-brace-format',
     )
     VAULT_NATIVE_PADDED_PLAINTEXT = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "native"-type configuration directories.  '
         '"padding" and "plaintext" are cryptographic terms.',
     )(
-        context='Debug message',
-        single='Padded plaintext: {contents}',
+        'Debug message',
+        'Padded plaintext: {contents}',
         flags='python-brace-format',
     )
     VAULT_NATIVE_PARSE_BUFFER = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "native"-type configuration directories.  '
         'It is preceded by the info message '
         'VAULT_NATIVE_PARSING_IV_PAYLOAD_MAC; see the commentary there '
         'concerning the terms and thoughts on translating them.',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Buffer: {contents}
 
   \b
@@ -1369,19 +1368,19 @@ Buffer: {contents}
         flags='python-brace-format',
     )
     VAULT_NATIVE_PLAINTEXT = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "native"-type configuration directories.  '
         '"plaintext" is a cryptographic term.',
     )(
-        context='Debug message',
-        single='Plaintext: {contents}',
+        'Debug message',
+        'Plaintext: {contents}',
         flags='python-brace-format',
     )
     VAULT_NATIVE_PBKDF2_CALL = _Commented(
-        comments='',
+        '',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Master key derivation:
 
   \b
@@ -1392,15 +1391,15 @@ Master key derivation:
         flags='python-brace-format',
     )
     VAULT_NATIVE_V02_PAYLOAD_MAC_POSTPROCESSING = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "native"-type configuration directories.  '
         'It is preceded by the info message '
         'VAULT_NATIVE_PARSING_IV_PAYLOAD_MAC and the debug message '
         'PARSING_NATIVE_PARSE_BUFFER; see the commentary there concerning '
         'the terms and thoughts on translating them.',
     )(
-        context='Debug message',
-        single="""\
+        'Debug message',
+        """\
 Postprocessing buffer (v0.2):
 
   \b
@@ -1413,7 +1412,7 @@ Postprocessing buffer (v0.2):
 
 class InfoMsgTemplate(enum.Enum):
     ASSEMBLING_CONFIG_STRUCTURE = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "storeroom"-type configuration directories.  '
         'The system stores entries in different "buckets" of a hash table.  '
         'After the respective items in the buckets have been decrypted, '
@@ -1422,51 +1421,51 @@ class InfoMsgTemplate(enum.Enum):
         'existing directory tree to rely on, but rather must '
         'build it on-the-fly), hence the term "assembling".',
     )(
-        context='Info message',
-        single='Assembling config structure',
+        'Info message',
+        'Assembling config structure',
     )
     CANNOT_LOAD_AS_VAULT_CONFIG = _Commented(
-        comments='"fmt" is a string such as "v0.2" or "storeroom", '
+        '"fmt" is a string such as "v0.2" or "storeroom", '
         'indicating the format which we tried to load the '
         'vault configuration as.',
     )(
-        context='Info message',
-        single='Cannot load {path!r} as a {fmt!s} vault configuration.',
+        'Info message',
+        'Cannot load {path!r} as a {fmt!s} vault configuration.',
         flags='python-brace-format',
     )
     CHECKING_CONFIG_STRUCTURE_CONSISTENCY = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "storeroom"-type configuration directories.  '
         'Having "assembled" the configuration items according to '
         'their claimed paths and contents, we then check if the '
         'assembled structure is internally consistent.',
     )(
-        context='Info message',
-        single='Checking config structure consistency',
+        'Info message',
+        'Checking config structure consistency',
     )
     DECRYPTING_BUCKET = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "storeroom"-type configuration directories.  '
         'The system stores entries in different "buckets" of a hash table.  '
         'We parse the directory bucket by bucket.  '
         'All buckets are numbered in hexadecimal, and typically there are '
         '32 buckets, so 2-digit hex numbers.',
     )(
-        context='Info message',
-        single='Decrypting bucket {bucket_number}',
+        'Info message',
+        'Decrypting bucket {bucket_number}',
         flags='python-brace-format',
     )
     PARSING_MASTER_KEYS_DATA = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "storeroom"-type configuration directories.  '
         '`.keys` is a filename, from which data about the master keys '
         'for this configuration are loaded.',
     )(
-        context='Info message',
-        single='Parsing master keys data from .keys',
+        'Info message',
+        'Parsing master keys data from .keys',
     )
     PIP_INSTALL_EXTRA = _Commented(
-        comments='This message immediately follows an error message about '
+        'This message immediately follows an error message about '
         'a missing library that needs to be installed.  '
         'The Python Package Index (PyPI) supports declaring sets of '
         'optional dependencies as "extras", so users installing from PyPI '
@@ -1475,38 +1474,38 @@ class InfoMsgTemplate(enum.Enum):
         'missing libraries automatically, '
         'hence this suggestion to PyPI users.',
     )(
-        context='Info message',
-        single='For users installing from PyPI, see the {extra_name!r} extra.',
+        'Info message',
+        'For users installing from PyPI, see the {extra_name!r} extra.',
         flags='python-brace-format',
     )
     SUCCESSFULLY_MIGRATED = _Commented(
-        comments='This info message immediately follows the '
+        'This info message immediately follows the '
         '"Using deprecated v0.1-style ..." deprecation warning.',
     )(
-        context='Info message',
-        single='Successfully migrated to {path!r}.',
+        'Info message',
+        'Successfully migrated to {path!r}.',
         flags='python-brace-format',
     )
     VAULT_NATIVE_CHECKING_MAC = _Commented(
-        comments='',
+        '',
     )(
-        context='Info message',
-        single='Checking MAC',
+        'Info message',
+        'Checking MAC',
     )
     VAULT_NATIVE_DECRYPTING_CONTENTS = _Commented(
-        comments='',
+        '',
     )(
-        context='Info message',
-        single='Decrypting contents',
+        'Info message',
+        'Decrypting contents',
     )
     VAULT_NATIVE_DERIVING_KEYS = _Commented(
-        comments='',
+        '',
     )(
-        context='Info message',
-        single='Deriving an encryption and signing key',
+        'Info message',
+        'Deriving an encryption and signing key',
     )
     VAULT_NATIVE_PARSING_IV_PAYLOAD_MAC = _Commented(
-        comments='This message is emitted by the vault configuration exporter '
+        'This message is emitted by the vault configuration exporter '
         'for "native"-type configuration directories.  '
         '"IV" means "initialization vector", and "MAC" means '
         '"message authentication code".  '
@@ -1517,26 +1516,26 @@ class InfoMsgTemplate(enum.Enum):
         'Please use your judgement as to whether to translate these terms '
         'or not, expanded or not.',
     )(
-        context='Info message',
-        single='Parsing IV, payload and MAC from the file contents',
+        'Info message',
+        'Parsing IV, payload and MAC from the file contents',
     )
 
 
 class WarnMsgTemplate(enum.Enum):
     EMPTY_SERVICE_NOT_SUPPORTED = _Commented(
-        comments='',
+        '',
     )(
-        context='Warning message',
-        single='An empty {service_metavar!s} is not supported by vault(1).  '
+        'Warning message',
+        'An empty {service_metavar!s} is not supported by vault(1).  '
         'For compatibility, this will be treated as if SERVICE was not '
         'supplied, i.e., it will error out, or operate on global settings.',
         flags='python-brace-format',
     )
     EMPTY_SERVICE_SETTINGS_INACCESSIBLE = _Commented(
-        comments='',
+        '',
     )(
-        context='Warning message',
-        single='An empty {service_metavar!s} is not supported by vault(1).  '
+        'Warning message',
+        'An empty {service_metavar!s} is not supported by vault(1).  '
         'The empty-string service settings will be inaccessible '
         'and ineffective.  '
         'To ensure that vault(1) and {PROG_NAME!s} see the settings, '  # noqa: RUF027
@@ -1544,21 +1543,21 @@ class WarnMsgTemplate(enum.Enum):
         flags='python-brace-format',
     )
     FAILED_TO_MIGRATE_CONFIG = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Warning message',
-        single='Failed to migrate to {path!r}: {error!s}: {filename!r}.',
+        'Warning message',
+        'Failed to migrate to {path!r}: {error!s}: {filename!r}.',
         flags='python-brace-format',
     )
     GLOBAL_PASSPHRASE_INEFFECTIVE = _Commented(
-        comments='',
+        '',
     )(
-        context='Warning message',
-        single='Setting a global passphrase is ineffective '
+        'Warning message',
+        'Setting a global passphrase is ineffective '
         'because a key is also set.',
     )
     PASSPHRASE_NOT_NORMALIZED = _Commented(
-        comments='The key is a (vault) configuration key, in JSONPath syntax, '
+        'The key is a (vault) configuration key, in JSONPath syntax, '
         'typically "$.global" for the global passphrase or '
         '"$.services.service_name" or "$.services["service with spaces"]" '
         'for the services "service_name" and "service with spaces", '
@@ -1569,8 +1568,8 @@ class WarnMsgTemplate(enum.Enum):
         'Please feel free to substitute any other appropriate way to '
         'mark up emphasis of the word "displays".',
     )(
-        context='Warning message',
-        single='The {key!s} passphrase is not {form!s}-normalized.  '
+        'Warning message',
+        'The {key!s} passphrase is not {form!s}-normalized.  '
         'Its serialization as a byte string may not be what you '
         'expect it to be, even if it *displays* correctly.  '
         'Please make sure to double-check any derived passphrases '
@@ -1578,10 +1577,10 @@ class WarnMsgTemplate(enum.Enum):
         flags='python-brace-format',
     )
     SERVICE_NAME_INCOMPLETABLE = _Commented(
-        comments='',
+        '',
     )(
-        context='Warning message',
-        single='The service name {service!r} contains an ASCII control character, '
+        'Warning message',
+        'The service name {service!r} contains an ASCII control character, '
         'which is not supported by our shell completion code.  '
         'This service name will therefore not be available for completion '
         'on the command-line.  '
@@ -1591,45 +1590,45 @@ class WarnMsgTemplate(enum.Enum):
         flags='python-brace-format',
     )
     SERVICE_PASSPHRASE_INEFFECTIVE = _Commented(
-        comments='The key that is set need not necessarily be set at the '
+        'The key that is set need not necessarily be set at the '
         'service level; it may be a global key as well.',
     )(
-        context='Warning message',
-        single='Setting a service passphrase is ineffective '
+        'Warning message',
+        'Setting a service passphrase is ineffective '
         'because a key is also set: {service!s}.',
         flags='python-brace-format',
     )
     STEP_REMOVE_INEFFECTIVE_VALUE = _Commented(
-        comments='',
+        '',
     )(
-        context='Warning message',
-        single='Removing ineffective setting {path!s} = {old!s}.',
+        'Warning message',
+        'Removing ineffective setting {path!s} = {old!s}.',
         flags='python-brace-format',
     )
     STEP_REPLACE_INVALID_VALUE = _Commented(
-        comments='',
+        '',
     )(
-        context='Warning message',
-        single='Replacing invalid value {old!s} for key {path!s} with {new!s}.',
+        'Warning message',
+        'Replacing invalid value {old!s} for key {path!s} with {new!s}.',
         flags='python-brace-format',
     )
     V01_STYLE_CONFIG = _Commented(
-        comments='',
+        '',
     )(
-        context='Warning message :: Deprecation',
-        single='Using deprecated v0.1-style config file {old!r}, '
+        'Warning message :: Deprecation',
+        'Using deprecated v0.1-style config file {old!r}, '
         'instead of v0.2-style {new!r}.  '
         'Support for v0.1-style config filenames will be removed in v1.0.',
         flags='python-brace-format',
     )
     V10_SUBCOMMAND_REQUIRED = _Commented(
-        comments='This deprecation warning may be issued at any level, '
+        'This deprecation warning may be issued at any level, '
         'i.e. we may actually be talking about subcommands, '
         'or sub-subcommands, or sub-sub-subcommands, etc., '
         'which is what the "here" is supposed to indicate.',
     )(
-        context='Warning message :: Deprecation',
-        single='A subcommand will be required here in v1.0.  '
+        'Warning message :: Deprecation',
+        'A subcommand will be required here in v1.0.  '
         'See --help for available subcommands.  '
         'Defaulting to subcommand "vault".',
     )
@@ -1637,65 +1636,64 @@ class WarnMsgTemplate(enum.Enum):
 
 class ErrMsgTemplate(enum.Enum):
     AGENT_REFUSED_LIST_KEYS = _Commented(
-        comments='"loaded keys" being keys loaded into the agent.',
+        '"loaded keys" being keys loaded into the agent.',
     )(
-        context='Error message',
-        single='The SSH agent failed to or refused to supply '
-        'a list of loaded keys.',
+        'Error message',
+        'The SSH agent failed to or refused to supply a list of loaded keys.',
     )
     AGENT_REFUSED_SIGNATURE = _Commented(
-        comments='The message to be signed is the vault UUID, '
+        'The message to be signed is the vault UUID, '
         "but there's no space to explain that here, "
         'so ideally the error message does not go into detail.',
     )(
-        context='Error message',
-        single='The SSH agent failed to or refused to issue a signature '
+        'Error message',
+        'The SSH agent failed to or refused to issue a signature '
         'with the selected key, necessary for deriving a service passphrase.',
     )
     CANNOT_CONNECT_TO_AGENT = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Error message',
-        single='Cannot connect to the SSH agent: {error!s}: {filename!r}.',
+        'Error message',
+        'Cannot connect to the SSH agent: {error!s}: {filename!r}.',
         flags='python-brace-format',
     )
     CANNOT_DECODEIMPORT_VAULT_SETTINGS = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Error message',
-        single='Cannot import vault settings: cannot decode JSON: {error!s}.',
+        'Error message',
+        'Cannot import vault settings: cannot decode JSON: {error!s}.',
         flags='python-brace-format',
     )
     CANNOT_EXPORT_VAULT_SETTINGS = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Error message',
-        single='Cannot export vault settings: {error!s}: {filename!r}.',
+        'Error message',
+        'Cannot export vault settings: {error!s}: {filename!r}.',
         flags='python-brace-format',
     )
     CANNOT_IMPORT_VAULT_SETTINGS = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Error message',
-        single='Cannot import vault settings: {error!s}: {filename!r}.',
+        'Error message',
+        'Cannot import vault settings: {error!s}: {filename!r}.',
         flags='python-brace-format',
     )
     CANNOT_LOAD_USER_CONFIG = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Error message',
-        single='Cannot load user config: {error!s}: {filename!r}.',
+        'Error message',
+        'Cannot load user config: {error!s}: {filename!r}.',
         flags='python-brace-format',
     )
     CANNOT_LOAD_VAULT_SETTINGS = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Error message',
-        single='Cannot load vault settings: {error!s}: {filename!r}.',
+        'Error message',
+        'Cannot load vault settings: {error!s}: {filename!r}.',
         flags='python-brace-format',
     )
     CANNOT_PARSE_AS_VAULT_CONFIG = _Commented(
-        comments='Unlike the "Cannot load {path!r} as a {fmt!s} '
+        'Unlike the "Cannot load {path!r} as a {fmt!s} '
         'vault configuration." message, *this* error message is emitted '
         'when we have tried loading the path in each of our '
         'supported formats, and failed.  '
@@ -1703,28 +1701,28 @@ class ErrMsgTemplate(enum.Enum):
         'potentially multiple times, '
         'and this error message at the very bottom.',
     )(
-        context='Error message',
-        single='Cannot parse {path!r} as a valid vault-native '
+        'Error message',
+        'Cannot parse {path!r} as a valid vault-native '
         'configuration file/directory.',
         flags='python-brace-format',
     )
     CANNOT_PARSE_AS_VAULT_CONFIG_OSERROR = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Error message',
-        single=r'Cannot parse {path!r} as a valid vault-native '
+        'Error message',
+        r'Cannot parse {path!r} as a valid vault-native '
         'configuration file/directory: {error!s}: {filename!r}.',
         flags='python-brace-format',
     )
     CANNOT_STORE_VAULT_SETTINGS = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Error message',
-        single='Cannot store vault settings: {error!s}: {filename!r}.',
+        'Error message',
+        'Cannot store vault settings: {error!s}: {filename!r}.',
         flags='python-brace-format',
     )
     CANNOT_UNDERSTAND_AGENT = _Commented(
-        comments='This error message is used whenever we cannot make '
+        'This error message is used whenever we cannot make '
         'any sense of a response from the SSH agent '
         'because the response is ill-formed '
         '(truncated, improperly encoded, etc.) '
@@ -1733,12 +1731,12 @@ class ErrMsgTemplate(enum.Enum):
         'even if they indicate that the requested operation failed, '
         'are handled with a different error message.',
     )(
-        context='Error message',
-        single="Cannot understand the SSH agent's response because it "
+        'Error message',
+        "Cannot understand the SSH agent's response because it "
         'violates the communications protocol.',
     )
     CANNOT_UPDATE_SETTINGS_NO_SETTINGS = _Commented(
-        comments='The settings_type metavar contains translations for '
+        'The settings_type metavar contains translations for '
         'either "global settings" or "service-specific settings"; '
         'see the CANNOT_UPDATE_SETTINGS_METAVAR_SETTINGS_TYPE_GLOBAL and '
         'CANNOT_UPDATE_SETTINGS_METAVAR_SETTINGS_TYPE_SERVICE entries.  '
@@ -1750,139 +1748,138 @@ class ErrMsgTemplate(enum.Enum):
         'in any way you see fit that achieves the desired translations '
         'of the first sentence.',
     )(
-        context='Error message',
-        single='Cannot update the {settings_type!s} without any given settings.  '
+        'Error message',
+        'Cannot update the {settings_type!s} without any given settings.  '
         'You must specify at least one of --lower, ..., --symbol, '
         'or --phrase or --key.',
         flags='python-brace-format',
     )
     INVALID_USER_CONFIG = _Commented(
-        comments='"error" is supplied by the operating system (errno/strerror).',
+        '"error" is supplied by the operating system (errno/strerror).',
     )(
-        context='Error message',
-        single='The user configuration file is invalid.  '
-        '{error!s}: {filename!r}.',
+        'Error message',
+        'The user configuration file is invalid.  {error!s}: {filename!r}.',
         flags='python-brace-format',
     )
     INVALID_VAULT_CONFIG = _Commented(
-        comments='This error message is a reaction to a validator function '
+        'This error message is a reaction to a validator function '
         'saying *that* the configuration is not valid, '
         'but not *how* it is not valid.  '
         'The configuration file is principally parsable, however.',
     )(
-        context='Error message',
-        single='Invalid vault config: {config!r}.',
+        'Error message',
+        'Invalid vault config: {config!r}.',
         flags='python-brace-format',
     )
     MISSING_MODULE = _Commented(
-        comments='',
+        '',
     )(
-        context='Error message',
-        single='Cannot load the required Python module {module!r}.',
+        'Error message',
+        'Cannot load the required Python module {module!r}.',
         flags='python-brace-format',
     )
     NO_AF_UNIX = _Commented(
-        comments='',
+        '',
     )(
-        context='Error message',
-        single='Cannot connect to an SSH agent because this Python version '
+        'Error message',
+        'Cannot connect to an SSH agent because this Python version '
         'does not support UNIX domain sockets.',
     )
     NO_KEY_OR_PHRASE = _Commented(
-        comments='',
+        '',
     )(
-        context='Error message',
-        single='No passphrase or key was given in the configuration.  '
+        'Error message',
+        'No passphrase or key was given in the configuration.  '
         'In this case, the --phrase or --key argument is required.',
     )
     NO_SSH_AGENT_FOUND = _Commented(
-        comments='',
+        '',
     )(
-        context='Error message',
-        single='Cannot find any running SSH agent because SSH_AUTH_SOCK is not set.',
+        'Error message',
+        'Cannot find any running SSH agent because SSH_AUTH_SOCK is not set.',
     )
     NO_SUITABLE_SSH_KEYS = _Commented(
-        comments='',
+        '',
     )(
-        context='Error message',
-        single='The SSH agent contains no keys suitable for {PROG_NAME!s}.',  # noqa: RUF027
+        'Error message',
+        'The SSH agent contains no keys suitable for {PROG_NAME!s}.',  # noqa: RUF027
         flags='python-brace-format',
     )
     PARAMS_MUTUALLY_EXCLUSIVE = _Commented(
-        comments='The params are long-form command-line option names.  '
+        'The params are long-form command-line option names.  '
         'Typical example: "--key is mutually exclusive with --phrase."',
     )(
-        context='Error message',
-        single='{param1!s} is mutually exclusive with {param2!s}.',
+        'Error message',
+        '{param1!s} is mutually exclusive with {param2!s}.',
         flags='python-brace-format',
     )
     PARAMS_NEEDS_SERVICE_OR_CONFIG = _Commented(
-        comments='The param is a long-form command-line option name, '
+        'The param is a long-form command-line option name, '
         'the metavar is Label.VAULT_METAVAR_SERVICE.',
     )(
-        context='Error message',
-        single='{param!s} requires a {service_metavar!s} or --config.',
+        'Error message',
+        '{param!s} requires a {service_metavar!s} or --config.',
         flags='python-brace-format',
     )
     PARAMS_NEEDS_SERVICE = _Commented(
-        comments='The param is a long-form command-line option name, '
+        'The param is a long-form command-line option name, '
         'the metavar is Label.VAULT_METAVAR_SERVICE.',
     )(
-        context='Error message',
-        single='{param!s} requires a {service_metavar!s}.',
+        'Error message',
+        '{param!s} requires a {service_metavar!s}.',
         flags='python-brace-format',
     )
     PARAMS_NO_SERVICE = _Commented(
-        comments='The param is a long-form command-line option name, '
+        'The param is a long-form command-line option name, '
         'the metavar is Label.VAULT_METAVAR_SERVICE.',
     )(
-        context='Error message',
-        single='{param!s} does not take a {service_metavar!s} argument.',
+        'Error message',
+        '{param!s} does not take a {service_metavar!s} argument.',
         flags='python-brace-format',
     )
     SERVICE_REQUIRED = _Commented(
-        comments='The metavar is Label.VAULT_METAVAR_SERVICE.',
+        'The metavar is Label.VAULT_METAVAR_SERVICE.',
     )(
-        context='Error message',
-        single='Deriving a passphrase requires a {service_metavar!s}.',
+        'Error message',
+        'Deriving a passphrase requires a {service_metavar!s}.',
         flags='python-brace-format',
     )
     SET_AND_UNSET_SAME_SETTING = _Commented(
-        comments='The rephrasing '
+        'The rephrasing '
         '"Attempted to unset and set the same setting '
         '(--unset={setting!s} --{setting!s}=...) at the same time."'
         'may or may not be more suitable as a basis for translation instead.',
     )(
-        context='Error message',
-        single='Attempted to unset and set --{setting!s} at the same time.',
+        'Error message',
+        'Attempted to unset and set --{setting!s} at the same time.',
         flags='python-brace-format',
     )
     SSH_KEY_NOT_LOADED = _Commented(
-        comments='',
+        '',
     )(
-        context='Error message',
-        single='The requested SSH key is not loaded into the agent.',
+        'Error message',
+        'The requested SSH key is not loaded into the agent.',
     )
     USER_ABORTED_EDIT = _Commented(
-        comments='The user requested to edit the notes for a service, '
+        'The user requested to edit the notes for a service, '
         'but aborted the request mid-editing.',
     )(
-        context='Error message',
-        single='Not saving any new notes: the user aborted the request.',
+        'Error message',
+        'Not saving any new notes: the user aborted the request.',
     )
     USER_ABORTED_PASSPHRASE = _Commented(
-        comments='The user was prompted for a master passphrase, '
+        'The user was prompted for a master passphrase, '
         'but aborted the request.',
     )(
-        context='Error message',
-        single='No passphrase was given; the user aborted the request.',
+        'Error message',
+        'No passphrase was given; the user aborted the request.',
     )
     USER_ABORTED_SSH_KEY_SELECTION = _Commented(
-        comments='The user was prompted to select a master SSH key, '
+        'The user was prompted to select a master SSH key, '
         'but aborted the request.',
     )(
-        context='Error message',
-        single='No SSH key was selected; the user aborted the request.',
+        'Error message',
+        'No SSH key was selected; the user aborted the request.',
     )
 
 
