diff --git a/configure b/configure
index 32aed7e49f2c04..0338c672880b94 100755
--- a/configure
+++ b/configure
@@ -3944,10 +3944,11 @@ then
 	then
 		found_gcc=
 		found_clang=
-		as_save_IFS=$IFS; IFS=:
+		save_IFS=$IFS
+		IFS=:
 		for as_dir in $PATH
 		do
-			IFS=$as_save_IFS
+			IFS=$save_IFS
 			if test -x "${as_dir}/gcc"; then
 				if test -z "${found_gcc}"; then
 					found_gcc="${as_dir}/gcc"
@@ -3959,7 +3960,7 @@ then
 				fi
 			fi
 		done
-		IFS=$as_save_IFS
+		IFS=$save_IFS
 
 		if test -n "$found_gcc" -a -n "$found_clang"
 		then
@@ -6053,7 +6054,7 @@ if ${ac_cv_wl_no_as_needed+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-  save_LDFLAGS="$LDFLAGS"
+  save_LDFLAGS=$LDFLAGS
   as_fn_append LDFLAGS -Wl,--no-as-needed
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6075,7 +6076,7 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS="$save_LDFLAGS"
+  LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wl_no_as_needed" >&5
@@ -6302,7 +6303,7 @@ if test "${enable_profiling+set}" = set; then :
 fi
 
 if test "x$enable_profiling" = xyes; then
-  ac_save_cc="$CC"
+  save_CC=$CC
   CC="$CC -pg"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6315,7 +6316,7 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  CC="$ac_save_cc"
+  CC=$save_CC
 else
   enable_profiling=no
 fi
@@ -7509,9 +7510,13 @@ fi
     # GCC produce warnings for legal Python code.  Enable
     # -fno-strict-aliasing on versions of GCC that support but produce
     # warnings.  See Issue3326
-     ac_save_cc="$CC"
+     save_CC=$CC
      CC="$CC -fno-strict-aliasing"
-     save_CFLAGS="$CFLAGS"
+     save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts and needs -fno-strict-aliasing" >&5
 $as_echo_n "checking whether $CC accepts and needs -fno-strict-aliasing... " >&6; }
 if ${ac_cv_no_strict_aliasing+:} false; then :
@@ -7532,7 +7537,7 @@ main ()
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-	   CC="$ac_save_cc -fstrict-aliasing"
+	   CC="$save_CC -fstrict-aliasing"
            CFLAGS="$CFLAGS -Werror -Wstrict-aliasing"
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7567,8 +7572,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_strict_aliasing" >&5
 $as_echo "$ac_cv_no_strict_aliasing" >&6; }
-     CFLAGS="$save_CFLAGS"
-     CC="$ac_save_cc"
+     CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+     CC=$save_CC
     if test "x$ac_cv_no_strict_aliasing" = xyes; then :
   BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"
 fi
@@ -7822,7 +7831,7 @@ $as_echo "$ac_cv_enable_strict_prototypes_warning" >&6; }
   CFLAGS_NODIST="$CFLAGS_NODIST -Wstrict-prototypes"
 fi
 
-     ac_save_cc="$CC"
+     save_CC=$CC
      CC="$CC -Werror=implicit-function-declaration"
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can make implicit function declaration an error in $CC" >&5
 $as_echo_n "checking if we can make implicit function declaration an error in $CC... " >&6; }
@@ -7855,13 +7864,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_implicit_function_declaration_error" >&5
 $as_echo "$ac_cv_enable_implicit_function_declaration_error" >&6; }
-     CC="$ac_save_cc"
+     CC=$save_CC
 
     if test "x$ac_cv_enable_implicit_function_declaration_error" = xyes; then :
   CFLAGS_NODIST="$CFLAGS_NODIST -Werror=implicit-function-declaration"
 fi
 
-     ac_save_cc="$CC"
+     save_CC=$CC
      CC="$CC -fvisibility=hidden"
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use visibility in $CC" >&5
 $as_echo_n "checking if we can use visibility in $CC... " >&6; }
@@ -7894,7 +7903,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_visibility" >&5
 $as_echo "$ac_cv_enable_visibility" >&6; }
-     CC="$ac_save_cc"
+     CC=$save_CC
 
     if test "x$ac_cv_enable_visibility" = xyes; then :
   CFLAGS_NODIST="$CFLAGS_NODIST -fvisibility=hidden"
@@ -8175,7 +8184,7 @@ $as_echo_n "checking whether $CC accepts -Kpthread... " >&6; }
 if ${ac_cv_kpthread+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_save_cc="$CC"
+  save_CC=$CC
 CC="$CC -Kpthread"
 if test "$cross_compiling" = yes; then :
   ac_cv_kpthread=no
@@ -8206,7 +8215,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-CC="$ac_save_cc"
+CC=$save_CC
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kpthread" >&5
 $as_echo "$ac_cv_kpthread" >&6; }
@@ -8224,7 +8233,7 @@ $as_echo_n "checking whether $CC accepts -Kthread... " >&6; }
 if ${ac_cv_kthread+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_save_cc="$CC"
+  save_CC=$CC
 CC="$CC -Kthread"
 if test "$cross_compiling" = yes; then :
   ac_cv_kthread=no
@@ -8255,7 +8264,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-CC="$ac_save_cc"
+CC=$save_CC
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kthread" >&5
 $as_echo "$ac_cv_kthread" >&6; }
@@ -8273,7 +8282,7 @@ $as_echo_n "checking whether $CC accepts -pthread... " >&6; }
 if ${ac_cv_pthread+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_save_cc="$CC"
+  save_CC=$CC
 CC="$CC -pthread"
 if test "$cross_compiling" = yes; then :
   ac_cv_pthread=no
@@ -8304,7 +8313,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-CC="$ac_save_cc"
+CC=$save_CC
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread" >&5
 $as_echo "$ac_cv_pthread" >&6; }
@@ -8317,7 +8326,7 @@ if test ! -z "$CXX"
 then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX also accepts flags for thread support" >&5
 $as_echo_n "checking whether $CXX also accepts flags for thread support... " >&6; }
-ac_save_cxx="$CXX"
+save_CXX=$CXX
 
 if test "$ac_cv_kpthread" = "yes"
 then
@@ -8349,7 +8358,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_thread" >&5
 $as_echo "$ac_cv_cxx_thread" >&6; }
 fi
-CXX="$ac_save_cxx"
+CXX=$save_CXX
 
 
 
@@ -8595,7 +8604,7 @@ fi
 
 # bluetooth/bluetooth.h has been known to not compile with -std=c99.
 # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294
-SAVE_CFLAGS=$CFLAGS
+save_CFLAGS=$CFLAGS
 CFLAGS="-std=c99 $CFLAGS"
 for ac_header in bluetooth/bluetooth.h
 do :
@@ -8609,7 +8618,7 @@ fi
 
 done
 
-CFLAGS=$SAVE_CFLAGS
+CFLAGS=$save_CFLAGS
 
 # On Darwin (OS X) net/if.h requires sys/socket.h to be imported first.
 for ac_header in net/if.h
@@ -9608,7 +9617,7 @@ _ACEOF
 
 
 # if have pthread_t then define SIZEOF_PTHREAD_T
-ac_save_cc="$CC"
+save_CC=$CC
 if test "$ac_cv_kpthread" = "yes"
 then CC="$CC -Kpthread"
 elif test "$ac_cv_kthread" = "yes"
@@ -9765,7 +9774,7 @@ $as_echo "#define PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT 1" >>confdefs.h
 
 fi
 
-CC="$ac_save_cc"
+CC=$save_CC
 
 
 case $ac_sys_system/$ac_sys_release in
@@ -12351,7 +12360,7 @@ fi
 
 
 have_gdbm_dbmliborder=no
-as_save_IFS=$IFS
+save_IFS=$IFS
 IFS=:
 for db in $with_dbmliborder; do
     case $db in #(
@@ -12366,7 +12375,7 @@ for db in $with_dbmliborder; do
      ;;
 esac
 done
-IFS=$as_save_IFS
+IFS=$save_IFS
 if test "x$with_dbmliborder" = xerror; then :
 
   as_fn_error $? "proper usage is --with-dbmliborder=db1:db2:... (ndbm:gdbm:bdb)" "$LINENO" 5
@@ -17574,7 +17583,7 @@ if ${ac_cv_x87_double_rounding+:} false; then :
 else
 
 # $BASECFLAGS may affect the result
-ac_save_cc="$CC"
+save_CC=$CC
 CC="$CC $BASECFLAGS"
 if test "$cross_compiling" = yes; then :
   ac_cv_x87_double_rounding=no
@@ -17611,7 +17620,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-CC="$ac_save_cc"
+CC=$save_CC
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_x87_double_rounding" >&5
@@ -19086,7 +19095,7 @@ $as_echo "#define HAVE_STAT_TV_NSEC2 1" >>confdefs.h
 fi
 
 # first curses header check
-ac_save_cppflags="$CPPFLAGS"
+save_CPPFLAGS=$CPPFLAGS
 if test "$cross_compiling" = no; then
   CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
 fi
@@ -19647,7 +19656,7 @@ fi
 
 
 
-CPPFLAGS=$ac_save_cppflags
+CPPFLAGS=$save_CPPFLAGS
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
 $as_echo "$as_me: checking for device files" >&6;}
@@ -20933,7 +20942,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-as_save_IFS=$IFS
+save_IFS=$IFS
 IFS=,
 for builtin_hash in $with_builtin_hashlib_hashes; do
     case $builtin_hash in #(
@@ -20954,7 +20963,7 @@ for builtin_hash in $with_builtin_hashlib_hashes; do
      ;;
 esac
 done
-IFS=$as_save_IFS
+IFS=$save_IFS
 
 # --with-experimental-isolated-subinterpreters
 
diff --git a/configure.ac b/configure.ac
index ec71470a74e028..8b1dcc7b366403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,24 +24,24 @@ m4_ifdef(
 )dnl
 
 dnl Helpers for saving and restoring environment variables:
-dnl - _SAVE_VAR([VAR])         Helper for SAVE_ENV; stores VAR as save_VAR
-dnl - _RESTORE_VAR([VAR])      Helper for RESTORE_ENV; restores VAR from save_VAR
+dnl - SAVE_VAR([VAR])          Helper for SAVE_ENV; stores VAR as save_VAR
+dnl - RESTORE_VAR([VAR])       Helper for RESTORE_ENV; restores VAR from save_VAR
 dnl - SAVE_ENV                 Saves CFLAGS, LDFLAGS, LIBS, and CPPFLAGS
 dnl - RESTORE_ENV              Restores CFLAGS, LDFLAGS, LIBS, and CPPFLAGS
 dnl - WITH_SAVE_ENV([SCRIPT])  Runs SCRIPT wrapped with SAVE_ENV/RESTORE_ENV
-AC_DEFUN([_SAVE_VAR], [AS_VAR_COPY([save_][$1], [$1])])dnl
-AC_DEFUN([_RESTORE_VAR], [AS_VAR_COPY([$1], [save_][$1])])dnl
+AC_DEFUN([SAVE_VAR], [AS_VAR_COPY([save_][$1], [$1])])dnl
+AC_DEFUN([RESTORE_VAR], [AS_VAR_COPY([$1], [save_][$1])])dnl
 AC_DEFUN([SAVE_ENV],
-[_SAVE_VAR([CFLAGS])]
-[_SAVE_VAR([CPPFLAGS])]
-[_SAVE_VAR([LDFLAGS])]
-[_SAVE_VAR([LIBS])]
+[SAVE_VAR([CFLAGS])]
+[SAVE_VAR([CPPFLAGS])]
+[SAVE_VAR([LDFLAGS])]
+[SAVE_VAR([LIBS])]
 )dnl
 AC_DEFUN([RESTORE_ENV],
-[_RESTORE_VAR([CFLAGS])]
-[_RESTORE_VAR([CPPFLAGS])]
-[_RESTORE_VAR([LDFLAGS])]
-[_RESTORE_VAR([LIBS])]
+[RESTORE_VAR([CFLAGS])]
+[RESTORE_VAR([CPPFLAGS])]
+[RESTORE_VAR([LDFLAGS])]
+[RESTORE_VAR([LIBS])]
 )dnl
 AC_DEFUN([WITH_SAVE_ENV],
 [SAVE_ENV]
@@ -679,10 +679,11 @@ then
 	then
 		found_gcc=
 		found_clang=
-		as_save_IFS=$IFS; IFS=:
+		SAVE_VAR([IFS])
+		IFS=:
 		for as_dir in $PATH
 		do
-			IFS=$as_save_IFS
+			RESTORE_VAR([IFS])
 			if test -x "${as_dir}/gcc"; then
 				if test -z "${found_gcc}"; then
 					found_gcc="${as_dir}/gcc"
@@ -694,7 +695,7 @@ then
 				fi
 			fi
 		done
-		IFS=$as_save_IFS
+		RESTORE_VAR([IFS])
 
 		if test -n "$found_gcc" -a -n "$found_clang"
 		then
@@ -968,14 +969,14 @@ fi
 AC_SUBST(MULTIARCH_CPPFLAGS)
 
 AC_CACHE_CHECK([for -Wl,--no-as-needed], [ac_cv_wl_no_as_needed], [
-  save_LDFLAGS="$LDFLAGS"
+  SAVE_VAR([LDFLAGS])
   AS_VAR_APPEND([LDFLAGS], [-Wl,--no-as-needed])
   AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
     [NO_AS_NEEDED="-Wl,--no-as-needed"
      ac_cv_wl_no_as_needed=yes],
     [NO_AS_NEEDED=""
      ac_cv_wl_no_as_needed=no])
-  LDFLAGS="$save_LDFLAGS"
+  RESTORE_VAR([LDFLAGS])
 ])
 AC_SUBST(NO_AS_NEEDED)
 
@@ -1165,12 +1166,12 @@ AC_MSG_CHECKING(for --enable-profiling)
 AC_ARG_ENABLE(profiling,
               AS_HELP_STRING([--enable-profiling], [enable C-level code profiling with gprof (default is no)]))
 if test "x$enable_profiling" = xyes; then
-  ac_save_cc="$CC"
+  SAVE_VAR([CC])
   CC="$CC -pg"
   AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
     [],
     [enable_profiling=no])
-  CC="$ac_save_cc"
+  RESTORE_VAR([CC])
 else
   enable_profiling=no
 fi
@@ -1735,16 +1736,16 @@ yes)
     # GCC produce warnings for legal Python code.  Enable
     # -fno-strict-aliasing on versions of GCC that support but produce
     # warnings.  See Issue3326
-     ac_save_cc="$CC"
+     SAVE_VAR([CC])
      CC="$CC -fno-strict-aliasing"
-     save_CFLAGS="$CFLAGS"
+     SAVE_ENV
      AC_CACHE_CHECK([whether $CC accepts and needs -fno-strict-aliasing],
                     [ac_cv_no_strict_aliasing],
        AC_COMPILE_IFELSE(
          [
 	   AC_LANG_PROGRAM([[]], [[]])
 	 ],[
-	   CC="$ac_save_cc -fstrict-aliasing"
+	   CC="$save_CC -fstrict-aliasing"
            CFLAGS="$CFLAGS -Werror -Wstrict-aliasing"
            AC_COMPILE_IFELSE(
 	     [
@@ -1758,8 +1759,8 @@ yes)
 	 ],[
 	   ac_cv_no_strict_aliasing=no
 	 ]))
-     CFLAGS="$save_CFLAGS"
-     CC="$ac_save_cc"
+     RESTORE_ENV
+     RESTORE_VAR([CC])
     AS_VAR_IF([ac_cv_no_strict_aliasing], [yes],
               [BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"])
 
@@ -1805,7 +1806,7 @@ yes)
     AS_VAR_IF([ac_cv_enable_strict_prototypes_warning], [yes],
               [CFLAGS_NODIST="$CFLAGS_NODIST -Wstrict-prototypes"])
 
-     ac_save_cc="$CC"
+     SAVE_VAR([CC])
      CC="$CC -Werror=implicit-function-declaration"
      AC_CACHE_CHECK([if we can make implicit function declaration an error in $CC],
                     [ac_cv_enable_implicit_function_declaration_error],
@@ -1817,12 +1818,12 @@ yes)
 	 ],[
            ac_cv_enable_implicit_function_declaration_error=no
 	 ]))
-     CC="$ac_save_cc"
+     RESTORE_VAR([CC])
 
     AS_VAR_IF([ac_cv_enable_implicit_function_declaration_error], [yes],
               [CFLAGS_NODIST="$CFLAGS_NODIST -Werror=implicit-function-declaration"])
 
-     ac_save_cc="$CC"
+     SAVE_VAR([CC])
      CC="$CC -fvisibility=hidden"
      AC_CACHE_CHECK([if we can use visibility in $CC], [ac_cv_enable_visibility],
        AC_COMPILE_IFELSE(
@@ -1833,7 +1834,7 @@ yes)
 	 ],[
            ac_cv_enable_visibility=no
 	 ]))
-     CC="$ac_save_cc"
+     RESTORE_VAR([CC])
 
     AS_VAR_IF([ac_cv_enable_visibility], [yes],
               [CFLAGS_NODIST="$CFLAGS_NODIST -fvisibility=hidden"])
@@ -2066,7 +2067,7 @@ else
 # so we need to run a program to see whether it really made the
 # function available.
 AC_CACHE_CHECK([whether $CC accepts -Kpthread], [ac_cv_kpthread],
-[ac_save_cc="$CC"
+[SAVE_VAR([CC])
 CC="$CC -Kpthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
@@ -2082,7 +2083,7 @@ int main(){
   return 0;
 }
 ]])],[ac_cv_kpthread=yes],[ac_cv_kpthread=no],[ac_cv_kpthread=no])
-CC="$ac_save_cc"])
+RESTORE_VAR([CC])])
 fi
 
 if test $ac_cv_kpthread = no -a $ac_cv_pthread_is_default = no
@@ -2093,7 +2094,7 @@ then
 # so we need to run a program to see whether it really made the
 # function available.
 AC_CACHE_CHECK([whether $CC accepts -Kthread], [ac_cv_kthread],
-[ac_save_cc="$CC"
+[SAVE_VAR([CC])
 CC="$CC -Kthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
@@ -2109,7 +2110,7 @@ int main(){
   return 0;
 }
 ]])],[ac_cv_kthread=yes],[ac_cv_kthread=no],[ac_cv_kthread=no])
-CC="$ac_save_cc"])
+RESTORE_VAR([CC])])
 fi
 
 if test $ac_cv_kthread = no -a $ac_cv_pthread_is_default = no
@@ -2120,7 +2121,7 @@ then
 # so we need to run a program to see whether it really made the
 # function available.
 AC_CACHE_CHECK([whether $CC accepts -pthread], [ac_cv_pthread],
-[ac_save_cc="$CC"
+[SAVE_VAR([CC])
 CC="$CC -pthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
@@ -2136,7 +2137,7 @@ int main(){
   return 0;
 }
 ]])],[ac_cv_pthread=yes],[ac_cv_pthread=no],[ac_cv_pthread=no])
-CC="$ac_save_cc"])
+RESTORE_VAR([CC])])
 fi
 
 # If we have set a CC compiler flag for thread support then
@@ -2145,7 +2146,7 @@ ac_cv_cxx_thread=no
 if test ! -z "$CXX"
 then
 AC_MSG_CHECKING(whether $CXX also accepts flags for thread support)
-ac_save_cxx="$CXX"
+SAVE_VAR([CXX])
 
 if test "$ac_cv_kpthread" = "yes"
 then
@@ -2176,7 +2177,7 @@ then
 fi
 AC_MSG_RESULT($ac_cv_cxx_thread)
 fi
-CXX="$ac_save_cxx"
+RESTORE_VAR([CXX])
 
 dnl # check for ANSI or K&R ("traditional") preprocessor
 dnl AC_MSG_CHECKING(for C preprocessor type)
@@ -2212,10 +2213,10 @@ AC_HEADER_MAJOR
 
 # bluetooth/bluetooth.h has been known to not compile with -std=c99.
 # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294
-SAVE_CFLAGS=$CFLAGS
+SAVE_VAR([CFLAGS])
 CFLAGS="-std=c99 $CFLAGS"
 AC_CHECK_HEADERS(bluetooth/bluetooth.h)
-CFLAGS=$SAVE_CFLAGS
+RESTORE_VAR([CFLAGS])
 
 # On Darwin (OS X) net/if.h requires sys/socket.h to be imported first.
 AC_CHECK_HEADERS([net/if.h], [], [],
@@ -2395,7 +2396,7 @@ AC_CHECK_SIZEOF(time_t, [], [
 ])
 
 # if have pthread_t then define SIZEOF_PTHREAD_T
-ac_save_cc="$CC"
+SAVE_VAR([CC])
 if test "$ac_cv_kpthread" = "yes"
 then CC="$CC -Kpthread"
 elif test "$ac_cv_kthread" = "yes"
@@ -2436,7 +2437,7 @@ AS_VAR_IF([ac_cv_pthread_key_t_is_arithmetic_type], [yes], [
               [Define if pthread_key_t is compatible with int.])
 ])
 
-CC="$ac_save_cc"
+RESTORE_VAR([CC])
 
 AC_SUBST(OTHER_LIBTOOL_OPT)
 case $ac_sys_system/$ac_sys_release in
@@ -3417,7 +3418,7 @@ AC_ARG_WITH(dbmliborder,
 [], [with_dbmliborder=ndbm:gdbm:bdb])
 
 have_gdbm_dbmliborder=no
-as_save_IFS=$IFS
+SAVE_VAR([IFS])
 IFS=:
 for db in $with_dbmliborder; do
     AS_CASE([$db],
@@ -3427,7 +3428,7 @@ for db in $with_dbmliborder; do
       [with_dbmliborder=error]
     )
 done
-IFS=$as_save_IFS
+RESTORE_VAR([IFS])
 AS_VAR_IF([with_dbmliborder], [error], [
   AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:... (ndbm:gdbm:bdb)])
 ])
@@ -4785,7 +4786,7 @@ AS_VAR_IF([ac_cv_gcc_asm_for_mc68881], [yes], [
 # 0 otherwise.  See http://bugs.python.org/issue2937 for more info.
 AC_CACHE_CHECK([for x87-style double rounding], [ac_cv_x87_double_rounding], [
 # $BASECFLAGS may affect the result
-ac_save_cc="$CC"
+SAVE_VAR([CC])
 CC="$CC $BASECFLAGS"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdlib.h>
@@ -4810,7 +4811,7 @@ int main() {
 [ac_cv_x87_double_rounding=no],
 [ac_cv_x87_double_rounding=yes],
 [ac_cv_x87_double_rounding=no])
-CC="$ac_save_cc"
+RESTORE_VAR([CC])
 ])
 
 AS_VAR_IF([ac_cv_x87_double_rounding], [yes], [
@@ -5415,7 +5416,7 @@ then
 fi
 
 # first curses header check
-ac_save_cppflags="$CPPFLAGS"
+SAVE_VAR([CPPFLAGS])
 if test "$cross_compiling" = no; then
   CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
 fi
@@ -5502,7 +5503,7 @@ PY_CHECK_CURSES_FUNC([filter])
 PY_CHECK_CURSES_FUNC([has_key])
 PY_CHECK_CURSES_FUNC([typeahead])
 PY_CHECK_CURSES_FUNC([use_env])
-CPPFLAGS=$ac_save_cppflags
+RESTORE_VAR([CPPFLAGS])
 
 AC_MSG_NOTICE([checking for device files])
 
@@ -5919,7 +5920,7 @@ WITH_SAVE_ENV([
   AS_VAR_IF([ac_cv_search_shm_open], [-lrt], [POSIXSHMEM_LIBS="-lrt"])
 
   dnl Temporarily override ac_includes_default for AC_CHECK_FUNCS below.
-  _SAVE_VAR([ac_includes_default])
+  SAVE_VAR([ac_includes_default])
   ac_includes_default="\
   ${ac_includes_default}
   #ifndef __cplusplus
@@ -5929,7 +5930,7 @@ WITH_SAVE_ENV([
   #endif
   "
   AC_CHECK_FUNCS([shm_open shm_unlink], [have_posix_shmem=yes], [have_posix_shmem=no])
-  _RESTORE_VAR([ac_includes_default])
+  RESTORE_VAR([ac_includes_default])
 ])
 
 # Check for usable OpenSSL
@@ -6109,7 +6110,7 @@ AC_ARG_WITH(builtin-hashlib-hashes,
 AC_MSG_RESULT($with_builtin_hashlib_hashes)
 AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$with_builtin_hashlib_hashes")
 
-as_save_IFS=$IFS
+SAVE_VAR([IFS])
 IFS=,
 for builtin_hash in $with_builtin_hashlib_hashes; do
     AS_CASE($builtin_hash,
@@ -6121,7 +6122,7 @@ for builtin_hash in $with_builtin_hashlib_hashes; do
       [blake2], [with_builtin_blake2=yes]
     )
 done
-IFS=$as_save_IFS
+RESTORE_VAR([IFS])
 
 # --with-experimental-isolated-subinterpreters
 AH_TEMPLATE(EXPERIMENTAL_ISOLATED_SUBINTERPRETERS,