diff --git a/cf/auth-modules.m4 b/cf/auth-modules.m4
index 7fbbac94e..0bd0b25ee 100644
--- a/cf/auth-modules.m4
+++ b/cf/auth-modules.m4
@@ -16,9 +16,7 @@ if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_shared" = yes;
 fi
 
 case "${host}" in
-changequote(,)dnl
-*-*-irix[56]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
-changequote([,])dnl
+*-*-irix[[56]]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
 esac
 
 AC_MSG_RESULT($LIB_AUTH_SUBDIRS)
diff --git a/cf/broken-snprintf.m4 b/cf/broken-snprintf.m4
index d5d789768..720ec662a 100644
--- a/cf/broken-snprintf.m4
+++ b/cf/broken-snprintf.m4
@@ -8,9 +8,7 @@ AC_TRY_RUN([
 #include <string.h>
 int main()
 {
-changequote(`,')dnl
-	char foo[3];
-changequote([,])dnl
+	char foo[[3]];
 	snprintf(foo, 2, "12");
 	return strcmp(foo, "1");
 }],:,ac_cv_func_snprintf_working=no,:))
@@ -33,9 +31,7 @@ AC_TRY_RUN([
 
 int foo(int num, ...)
 {
-changequote(`,')dnl
-	char bar[3];
-changequote([,])dnl
+	char bar[[3]];
 	va_list arg;
 	va_start(arg, num);
 	vsnprintf(bar, 2, "%s", arg);
diff --git a/cf/krb-struct-winsize.m4 b/cf/krb-struct-winsize.m4
index 8ae063881..3bbea6d0a 100644
--- a/cf/krb-struct-winsize.m4
+++ b/cf/krb-struct-winsize.m4
@@ -10,9 +10,7 @@ AC_CACHE_VAL(ac_cv_struct_winsize, [
 ac_cv_struct_winsize=no
 for i in sys/termios.h sys/ioctl.h; do
 AC_EGREP_HEADER(
-changequote(, )dnl
-struct[ 	]*winsize,dnl
-changequote([,])dnl
+struct[[ 	]]*winsize,dnl
 $i, ac_cv_struct_winsize=yes; break)dnl
 done
 ])