diff --git a/src/commands/hexpire.json b/src/commands/hexpire.json
index b12b53bd3..8a2154785 100644
--- a/src/commands/hexpire.json
+++ b/src/commands/hexpire.json
@@ -36,38 +36,30 @@
             }
         ],
         "reply_schema": {
-            "oneOf": [
-                {
-                    "description": "Key does not exist.",
-                    "type": "null"
-                },
-                {
-                    "description": "Array of results",
-                    "type": "array",
-                    "minItems": 1,
-                    "maxItems": 4294967295,
-                    "items": {
-                        "oneOf": [
-                            {
-                                "description": "The field does not exist.",
-                                "const": -2
-                            },
-                            {
-                                "description": "Specified NX | XX | GT | LT condition not met",
-                                "const": 0
-                            },
-                            {
-                                "description": "Expiration time was set or updated.",
-                                "const": 1
-                            },
-                            {
-                                "description": "Field deleted because the specified expiration time is in the past.",
-                                "const": 2
-                            }
-                        ]
+            "description": "Array of results. Returns empty array if the key does not exist.",
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 4294967295,
+            "items": {
+                "oneOf": [
+                    {
+                        "description": "The field does not exist.",
+                        "const": -2
+                    },
+                    {
+                        "description": "Specified NX | XX | GT | LT condition not met",
+                        "const": 0
+                    },
+                    {
+                        "description": "Expiration time was set or updated.",
+                        "const": 1
+                    },
+                    {
+                        "description": "Field deleted because the specified expiration time is in the past.",
+                        "const": 2
                     }
-                }
-            ]
+                ]
+            }
         },
         "arguments": [
             {
diff --git a/src/commands/hexpireat.json b/src/commands/hexpireat.json
index 08a68a2f1..9ad178276 100644
--- a/src/commands/hexpireat.json
+++ b/src/commands/hexpireat.json
@@ -36,38 +36,30 @@
             }
         ],
         "reply_schema": {
-            "oneOf": [
-                {
-                    "description": "Key does not exist.",
-                    "type": "null"
-                },
-                {
-                    "description": "Array of results",
-                    "type": "array",
-                    "minItems": 1,
-                    "maxItems": 4294967295,
-                    "items": {
-                        "oneOf": [
-                            {
-                                "description": "The field does not exist.",
-                                "const": -2
-                            },
-                            {
-                                "description": "Specified NX | XX | GT | LT condition not met",
-                                "const": 0
-                            },
-                            {
-                                "description": "Expiration time was set or updated.",
-                                "const": 1
-                            },
-                            {
-                                "description": "Field deleted because the specified expiration time is in the past.",
-                                "const": 2
-                            }
-                        ]
+            "description": "Array of results. Returns empty array if the key does not exist.",
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 4294967295,
+            "items": {
+                "oneOf": [
+                    {
+                        "description": "The field does not exist.",
+                        "const": -2
+                    },
+                    {
+                        "description": "Specified NX | XX | GT | LT condition not met",
+                        "const": 0
+                    },
+                    {
+                        "description": "Expiration time was set or updated.",
+                        "const": 1
+                    },
+                    {
+                        "description": "Field deleted because the specified expiration time is in the past.",
+                        "const": 2
                     }
-                }
-            ]
+                ]
+            }
         },
         "arguments": [
             {
diff --git a/src/commands/hexpiretime.json b/src/commands/hexpiretime.json
index 54492aff4..1ba573432 100644
--- a/src/commands/hexpiretime.json
+++ b/src/commands/hexpiretime.json
@@ -35,35 +35,27 @@
             }
         ],
         "reply_schema": {
-            "oneOf": [
-                {
-                    "description": "Key does not exist.",
-                    "type": "null"
-                },
-                {
-                    "description": "Array of results",
-                    "type": "array",
-                    "minItems": 1,
-                    "maxItems": 4294967295,
-                    "items": {
-                        "oneOf": [
-                            {
-                                "description": "The field does not exist.",
-                                "const": -2
-                            },
-                            {
-                                "description": "The field exists but has no associated expire.",
-                                "const": -1
-                            },
-                            {
-                                "description": "Expiration Unix timestamp in seconds.",
-                                "type": "integer",
-                                "minimum": 1
-                            }
-                        ]
+            "description": "Array of results. Returns empty array if the key does not exist.",
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 4294967295,
+            "items": {
+                "oneOf": [
+                    {
+                        "description": "The field does not exist.",
+                        "const": -2
+                    },
+                    {
+                        "description": "The field exists but has no associated expire.",
+                        "const": -1
+                    },
+                    {
+                        "description": "Expiration Unix timestamp in seconds.",
+                        "type": "integer",
+                        "minimum": 1
                     }
-                }
-            ]
+                ]
+            }
         },
         "arguments": [
             {
diff --git a/src/commands/hpersist.json b/src/commands/hpersist.json
index 3b5ba6c55..ba79044d1 100644
--- a/src/commands/hpersist.json
+++ b/src/commands/hpersist.json
@@ -35,34 +35,26 @@
             }
         ],
         "reply_schema": {
-            "oneOf": [
-                {
-                    "description": "Key does not exist.",
-                    "type": "null"
-                },
-                {
-                    "description": "Array of results",
-                    "type": "array",
-                    "minItems": 1,
-                    "maxItems": 4294967295,
-                    "items": {
-                        "oneOf": [
-                            {
-                                "description": "The field does not exist.",
-                                "const": -2
-                            },
-                            {
-                                "description": "The field exists but has no associated expire.",
-                                "const": -1
-                            },
-                            {
-                                "description": "Expiration time was removed",
-                                "const": 1
-                            }
-                        ]
+            "description": "Array of results. Returns empty array if the key does not exist.",
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 4294967295,
+            "items": {
+                "oneOf": [
+                    {
+                        "description": "The field does not exist.",
+                        "const": -2
+                    },
+                    {
+                        "description": "The field exists but has no associated expire.",
+                        "const": -1
+                    },
+                    {
+                        "description": "Expiration time was removed",
+                        "const": 1
                     }
-                }
-            ]
+                ]
+            }
         },
         "arguments": [
             {
diff --git a/src/commands/hpexpire.json b/src/commands/hpexpire.json
index 728b9b1ca..6820987c6 100644
--- a/src/commands/hpexpire.json
+++ b/src/commands/hpexpire.json
@@ -36,38 +36,30 @@
             }
         ],
         "reply_schema": {
-            "oneOf": [
-                {
-                    "description": "Key does not exist.",
-                    "type": "null"
-                },
-                {
-                    "description": "Array of results",
-                    "type": "array",
-                    "minItems": 1,
-                    "maxItems": 4294967295,
-                    "items": {
-                        "oneOf": [
-                            {
-                                "description": "The field does not exist.",
-                                "const": -2
-                            },
-                            {
-                                "description": "Specified NX | XX | GT | LT condition not met",
-                                "const": 0
-                            },
-                            {
-                                "description": "Expiration time was set or updated.",
-                                "const": 1
-                            },
-                            {
-                                "description": "Field deleted because the specified expiration time is in the past.",
-                                "const": 2
-                            }
-                        ]
+            "description": "Array of results. Returns empty array if the key does not exist.",
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 4294967295,
+            "items": {
+                "oneOf": [
+                    {
+                        "description": "The field does not exist.",
+                        "const": -2
+                    },
+                    {
+                        "description": "Specified NX | XX | GT | LT condition not met",
+                        "const": 0
+                    },
+                    {
+                        "description": "Expiration time was set or updated.",
+                        "const": 1
+                    },
+                    {
+                        "description": "Field deleted because the specified expiration time is in the past.",
+                        "const": 2
                     }
-                }
-            ]
+                ]
+            }
         },
         "arguments": [
             {
diff --git a/src/commands/hpexpireat.json b/src/commands/hpexpireat.json
index 50cbb773e..0d08bb46e 100644
--- a/src/commands/hpexpireat.json
+++ b/src/commands/hpexpireat.json
@@ -36,38 +36,30 @@
             }
         ],
         "reply_schema": {
-            "oneOf": [
-                {
-                    "description": "Key does not exist.",
-                    "type": "null"
-                },
-                {
-                    "description": "Array of results",
-                    "type": "array",
-                    "minItems": 1,
-                    "maxItems": 4294967295,
-                    "items": {
-                        "oneOf": [
-                            {
-                                "description": "The field does not exist.",
-                                "const": -2
-                            },
-                            {
-                                "description": "Specified NX | XX | GT | LT condition not met",
-                                "const": 0
-                            },
-                            {
-                                "description": "Expiration time was set or updated.",
-                                "const": 1
-                            },
-                            {
-                                "description": "Field deleted because the specified expiration time is in the past.",
-                                "const": 2
-                            }
-                        ]
+            "description": "Array of results. Returns empty array if the key does not exist.",
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 4294967295,
+            "items": {
+                "oneOf": [
+                    {
+                        "description": "The field does not exist.",
+                        "const": -2
+                    },
+                    {
+                        "description": "Specified NX | XX | GT | LT condition not met",
+                        "const": 0
+                    },
+                    {
+                        "description": "Expiration time was set or updated.",
+                        "const": 1
+                    },
+                    {
+                        "description": "Field deleted because the specified expiration time is in the past.",
+                        "const": 2
                     }
-                }
-            ]
+                ]
+            }
         },
         "arguments": [
             {
diff --git a/src/commands/hpexpiretime.json b/src/commands/hpexpiretime.json
index b1eacb9ac..ec1b5e768 100644
--- a/src/commands/hpexpiretime.json
+++ b/src/commands/hpexpiretime.json
@@ -35,35 +35,27 @@
             }
         ],
         "reply_schema": {
-            "oneOf": [
-                {
-                    "description": "Key does not exist.",
-                    "type": "null"
-                },
-                {
-                    "description": "The keyname, popped member, and its score.",
-                    "type": "array",
-                    "minItems": 1,
-                    "maxItems": 4294967295,
-                    "items": {
-                        "oneOf": [
-                            {
-                                "description": "The field does not exist.",
-                                "const": -2
-                            },
-                            {
-                                "description": "The field exists but has no associated expire.",
-                                "const": -1
-                            },
-                            {
-                                "description": "Expiration Unix timestamp in milliseconds.",
-                                "type": "integer",
-                                "minimum": 1
-                            }
-                        ]
+            "description": "Array of results. Returns empty array if the key does not exist.",
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 4294967295,
+            "items": {
+                "oneOf": [
+                    {
+                        "description": "The field does not exist.",
+                        "const": -2
+                    },
+                    {
+                        "description": "The field exists but has no associated expire.",
+                        "const": -1
+                    },
+                    {
+                        "description": "Expiration Unix timestamp in milliseconds.",
+                        "type": "integer",
+                        "minimum": 1
                     }
-                }
-            ]
+                ]
+            }
         },
         "arguments": [
             {
diff --git a/src/commands/hpttl.json b/src/commands/hpttl.json
index fa2da4547..7aa3eb72d 100644
--- a/src/commands/hpttl.json
+++ b/src/commands/hpttl.json
@@ -35,35 +35,27 @@
             }
         ],
         "reply_schema": {
-            "oneOf": [
-                {
-                    "description": "Key does not exist.",
-                    "type": "null"
-                },
-                {
-                    "description": "Array of results",
-                    "type": "array",
-                    "minItems": 1,
-                    "maxItems": 4294967295,
-                    "items": {
-                        "oneOf": [
-                            {
-                                "description": "The field does not exist.",
-                                "const": -2
-                            },
-                            {
-                                "description": "The field exists but has no associated expire.",
-                                "const": -1
-                            },
-                            {
-                                "description": "TTL in milliseconds.",
-                                "type": "integer",
-                                "minimum": 1
-                            }
-                        ]
+            "description": "Array of results. Returns empty array if the key does not exist.",
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 4294967295,
+            "items": {
+                "oneOf": [
+                    {
+                        "description": "The field does not exist.",
+                        "const": -2
+                    },
+                    {
+                        "description": "The field exists but has no associated expire.",
+                        "const": -1
+                    },
+                    {
+                        "description": "TTL in milliseconds.",
+                        "type": "integer",
+                        "minimum": 1
                     }
-                }
-            ]
+                ]
+            }
         },
         "arguments": [
             {
diff --git a/src/commands/httl.json b/src/commands/httl.json
index 3e8b610a7..f7c7ce7b5 100644
--- a/src/commands/httl.json
+++ b/src/commands/httl.json
@@ -35,35 +35,27 @@
             }
         ],
         "reply_schema": {
-            "oneOf": [
-                {
-                    "description": "Key does not exist.",
-                    "type": "null"
-                },
-                {
-                    "description": "Array of results",
-                    "type": "array",
-                    "minItems": 1,
-                    "maxItems": 4294967295,
-                    "items": {
-                        "oneOf": [
-                            {
-                                "description": "The field does not exist.",
-                                "const": -2
-                            },
-                            {
-                                "description": "The field exists but has no associated expire.",
-                                "const": -1
-                            },
-                            {
-                                "description": "TTL in seconds.",
-                                "type": "integer",
-                                "minimum": 1
-                            }
-                        ]
+            "description": "Array of results. Returns empty array if the key does not exist.",
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 4294967295,
+            "items": {
+                "oneOf": [
+                    {
+                        "description": "The field does not exist.",
+                        "const": -2
+                    },
+                    {
+                        "description": "The field exists but has no associated expire.",
+                        "const": -1
+                    },
+                    {
+                        "description": "TTL in seconds.",
+                        "type": "integer",
+                        "minimum": 1
                     }
-                }
-            ]
+                ]
+            }
         },
         "arguments": [
             {