diff --git a/include/fast_float/float_common.h b/include/fast_float/float_common.h
index 28c55f7..7f2d002 100644
--- a/include/fast_float/float_common.h
+++ b/include/fast_float/float_common.h
@@ -72,15 +72,7 @@ template <typename UC> struct parse_options_t {
       : format(fmt), decimal_point(dot), base(static_cast<uint8_t>(b)) {}
 
   /** Which number formats are accepted */
-  const chars_format format
-      // adjust for deprecated feature macros
-#ifdef FASTFLOAT_ALLOWS_LEADING_PLUS
-                            | chars_format::allow_leading_plus
-#endif
-#ifdef FASTFLOAT_SKIP_WHITE_SPACE
-                            | chars_format::skip_white_space
-#endif
-                            ;
+  const chars_format format;
   /** The character used as decimal point */
   const UC decimal_point;
   /** The base used for integers */
diff --git a/include/fast_float/parse_number.h b/include/fast_float/parse_number.h
index 017cc9c..0798603 100644
--- a/include/fast_float/parse_number.h
+++ b/include/fast_float/parse_number.h
@@ -378,7 +378,7 @@ from_chars_int_advanced(UC const *first, UC const *last, T &value,
 #endif
   if (
 #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN
-      first == last
+      first == last ||
 #endif
       options.base < 2 || options.base > 36) {
     from_chars_result_t<UC> answer;