diff --git a/src/core/device.c b/src/core/device.c
index 08235caa42..ea06f0ccb4 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -364,7 +364,7 @@ static const struct {
 static int device_found_to_string_many(DeviceFound flags, char **ret) {
         _cleanup_free_ char *s = NULL;
 
-        assert(flags >= 0);
+        assert((flags & ~_DEVICE_FOUND_MASK) == 0);
         assert(ret);
 
         FOREACH_ELEMENT(i, device_found_map) {
diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c
index c4e2bd1591..7dc1c3b647 100644
--- a/src/libsystemd/sd-journal/journal-file.c
+++ b/src/libsystemd/sd-journal/journal-file.c
@@ -4070,8 +4070,7 @@ int journal_file_open(
         int r;
 
         assert(fd >= 0 || fname);
-        assert(file_flags >= 0);
-        assert(file_flags <= _JOURNAL_FILE_FLAGS_MAX);
+        assert((file_flags & ~_JOURNAL_FILE_FLAGS_ALL) == 0);
         assert(mmap_cache);
         assert(ret);
 
diff --git a/src/libsystemd/sd-journal/journal-file.h b/src/libsystemd/sd-journal/journal-file.h
index 6019681316..89b06b0834 100644
--- a/src/libsystemd/sd-journal/journal-file.h
+++ b/src/libsystemd/sd-journal/journal-file.h
@@ -132,7 +132,7 @@ typedef enum JournalFileFlags {
         JOURNAL_COMPRESS        = 1 << 0,
         JOURNAL_SEAL            = 1 << 1,
         JOURNAL_STRICT_ORDER    = 1 << 2,
-        _JOURNAL_FILE_FLAGS_MAX = JOURNAL_COMPRESS|JOURNAL_SEAL|JOURNAL_STRICT_ORDER,
+        _JOURNAL_FILE_FLAGS_ALL = JOURNAL_COMPRESS|JOURNAL_SEAL|JOURNAL_STRICT_ORDER,
 } JournalFileFlags;
 
 typedef struct {
diff --git a/src/shared/format-table.h b/src/shared/format-table.h
index cc62b553a7..1a4cd56f4d 100644
--- a/src/shared/format-table.h
+++ b/src/shared/format-table.h
@@ -86,6 +86,7 @@ typedef enum TableErsatz {
         TABLE_ERSATZ_UNSET,
         TABLE_ERSATZ_NA,
         _TABLE_ERSATZ_MAX,
+        _TABLE_ERSATZ_INVALID = -EINVAL,
 } TableErsatz;
 
 typedef struct Table Table;