diff --git a/tools/api_checker/api_surface.json b/tools/api_checker/api_surface.json
index 0b35337f3..902aacfb6 100644
--- a/tools/api_checker/api_surface.json
+++ b/tools/api_checker/api_surface.json
@@ -190,7 +190,7 @@
       "name": "accept",
       "pretty_signature": "nlohmann::basic_json::accept",
       "scope": "nlohmann::basic_json",
-      "signature": "template<typename IteratorType> static bool accept(IteratorType first, IteratorType last, const bool ignore_comments = false, const bool ignore_trailing_commas = false)",
+      "signature": "template<typename IteratorType, typename SentinelType = IteratorType, detail::enable_if_t<detail::can_compare_ne<IteratorType, SentinelType>::value, int> = 0> static bool accept(IteratorType first, SentinelType last, const bool ignore_comments = false, const bool ignore_trailing_commas = false)",
       "tier": "callable"
     },
     {
@@ -847,7 +847,7 @@
       "name": "from_bjdata",
       "pretty_signature": "nlohmann::basic_json::from_bjdata",
       "scope": "nlohmann::basic_json",
-      "signature": "template<typename IteratorType> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_bjdata(IteratorType first, IteratorType last, const bool strict = true, const bool allow_exceptions = true)",
+      "signature": "template<typename IteratorType, typename SentinelType = IteratorType, detail::enable_if_t<detail::can_compare_ne<IteratorType, SentinelType>::value, int> = 0> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_bjdata(IteratorType first, SentinelType last, const bool strict = true, const bool allow_exceptions = true)",
       "tier": "callable"
     },
     {
@@ -874,7 +874,7 @@
       "name": "from_bson",
       "pretty_signature": "nlohmann::basic_json::from_bson",
       "scope": "nlohmann::basic_json",
-      "signature": "template<typename IteratorType> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_bson(IteratorType first, IteratorType last, const bool strict = true, const bool allow_exceptions = true)",
+      "signature": "template<typename IteratorType, typename SentinelType = IteratorType, detail::enable_if_t<detail::can_compare_ne<IteratorType, SentinelType>::value, int> = 0> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_bson(IteratorType first, SentinelType last, const bool strict = true, const bool allow_exceptions = true)",
       "tier": "callable"
     },
     {
@@ -910,7 +910,7 @@
       "name": "from_cbor",
       "pretty_signature": "nlohmann::basic_json::from_cbor",
       "scope": "nlohmann::basic_json",
-      "signature": "template<typename IteratorType> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_cbor(IteratorType first, IteratorType last, const bool strict = true, const bool allow_exceptions = true, const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)",
+      "signature": "template<typename IteratorType, typename SentinelType = IteratorType, detail::enable_if_t<detail::can_compare_ne<IteratorType, SentinelType>::value, int> = 0> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_cbor(IteratorType first, SentinelType last, const bool strict = true, const bool allow_exceptions = true, const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)",
       "tier": "callable"
     },
     {
@@ -946,7 +946,7 @@
       "name": "from_msgpack",
       "pretty_signature": "nlohmann::basic_json::from_msgpack",
       "scope": "nlohmann::basic_json",
-      "signature": "template<typename IteratorType> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_msgpack(IteratorType first, IteratorType last, const bool strict = true, const bool allow_exceptions = true)",
+      "signature": "template<typename IteratorType, typename SentinelType = IteratorType, detail::enable_if_t<detail::can_compare_ne<IteratorType, SentinelType>::value, int> = 0> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_msgpack(IteratorType first, SentinelType last, const bool strict = true, const bool allow_exceptions = true)",
       "tier": "callable"
     },
     {
@@ -982,7 +982,7 @@
       "name": "from_ubjson",
       "pretty_signature": "nlohmann::basic_json::from_ubjson",
       "scope": "nlohmann::basic_json",
-      "signature": "template<typename IteratorType> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_ubjson(IteratorType first, IteratorType last, const bool strict = true, const bool allow_exceptions = true)",
+      "signature": "template<typename IteratorType, typename SentinelType = IteratorType, detail::enable_if_t<detail::can_compare_ne<IteratorType, SentinelType>::value, int> = 0> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json from_ubjson(IteratorType first, SentinelType last, const bool strict = true, const bool allow_exceptions = true)",
       "tier": "callable"
     },
     {
@@ -1684,7 +1684,7 @@
       "name": "parse",
       "pretty_signature": "nlohmann::basic_json::parse",
       "scope": "nlohmann::basic_json",
-      "signature": "template<typename IteratorType> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json parse(IteratorType first, IteratorType last, parser_callback_t cb = nullptr, const bool allow_exceptions = true, const bool ignore_comments = false, const bool ignore_trailing_commas = false)",
+      "signature": "template<typename IteratorType, typename SentinelType = IteratorType, detail::enable_if_t<detail::can_compare_ne<IteratorType, SentinelType>::value, int> = 0> JSON_HEDLEY_WARN_UNUSED_RESULT static basic_json parse(IteratorType first, SentinelType last, parser_callback_t cb = nullptr, const bool allow_exceptions = true, const bool ignore_comments = false, const bool ignore_trailing_commas = false)",
       "tier": "callable"
     },
     {
@@ -1855,7 +1855,7 @@
       "name": "sax_parse",
       "pretty_signature": "nlohmann::basic_json::sax_parse",
       "scope": "nlohmann::basic_json",
-      "signature": "template<class IteratorType, class SAX> JSON_HEDLEY_NON_NULL(3) static bool sax_parse(IteratorType first, IteratorType last, SAX* sax, input_format_t format = input_format_t::json, const bool strict = true, const bool ignore_comments = false, const bool ignore_trailing_commas = false)",
+      "signature": "template<class IteratorType, class SAX, class SentinelType = IteratorType, detail::enable_if_t<detail::can_compare_ne<IteratorType, SentinelType>::value, int> = 0> JSON_HEDLEY_NON_NULL(3) static bool sax_parse(IteratorType first, SentinelType last, SAX* sax, input_format_t format = input_format_t::json, const bool strict = true, const bool ignore_comments = false, const bool ignore_trailing_commas = false)",
       "tier": "callable"
     },
     {