diff --git a/cfg.mk b/cfg.mk
index bd117e0f..c008638b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -158,24 +158,24 @@ sc_space_before_open_paren:
 
 exclude = \
   $(foreach a,$(1),$(eval $(subst $$,$$$$,exclude_file_name_regexp--sc_$(a))))
-$(call exclude,                                                         \
-  bindtextdomain=^lib/main.c$$                                          \
-  preprocessor_indentation=^data/|^lib/|^src/parse-gram.[ch]$$          \
-  program_name=^lib/main.c$$                                            \
-  prohibit_always-defined_macros=^data/yacc.c$$|^djgpp/                 \
-  prohibit_always-defined_macros+=?|^lib/timevar.c$$                    \
-  prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$      \
-  prohibit_always-defined_macros+=?|^tests/regression.at$$              \
-  prohibit_always_true_header_tests=^djgpp/subpipe.h$$|^lib/timevar.c$$ \
-  prohibit_always_true_header_tests+=?|^m4/timevar.m4$$                 \
-  prohibit_defined_have_decl_tests=?|^lib/timevar.c$$                   \
-  prohibit_doubled_word=^tests/named-refs.at$$                          \
-  prohibit_magic_number_exit=^doc/bison.texi$$                          \
-  prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$      \
-  prohibit_strcmp=^doc/bison\.texi|tests/local\.at$$                    \
-  prohibit_tab_based_indentation=\.(am|mk)$$|^djgpp/|^\.git|Makefile$$  \
-  require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$            \
-  space_before_open_paren=^(data/|djgpp/)                               \
-  two_space_separator_in_usage=^(bootstrap)                             \
-  unmarked_diagnostics=^(djgpp/|doc/bison.texi$$|tests/c\+\+\.at$$)     \
+$(call exclude,                                                                         \
+  bindtextdomain=^lib/main.c$$                                                          \
+  preprocessor_indentation=^data/|^lib/|^src/parse-gram.[ch]$$                          \
+  program_name=^lib/main.c$$                                                            \
+  prohibit_always-defined_macros=^data/yacc.c$$|^djgpp/                                 \
+  prohibit_always-defined_macros+=?|^lib/timevar.c$$                                    \
+  prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$                      \
+  prohibit_always-defined_macros+=?|^tests/regression.at$$                              \
+  prohibit_always_true_header_tests=^djgpp/subpipe.h$$|^lib/timevar.c$$                 \
+  prohibit_always_true_header_tests+=?|^m4/timevar.m4$$                                 \
+  prohibit_defined_have_decl_tests=?|^lib/timevar.c$$                                   \
+  prohibit_doubled_word=^tests/named-refs.at$$                                          \
+  prohibit_magic_number_exit=^doc/bison.texi$$                                          \
+  prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$                      \
+  prohibit_strcmp=^doc/bison\.texi|tests/local\.at$$                                    \
+  prohibit_tab_based_indentation=install-icc.sh|\.(am|mk)$$|^djgpp/|^\.git|Makefile$$   \
+  require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$                            \
+  space_before_open_paren=^(data/|djgpp/)                                               \
+  two_space_separator_in_usage=^(bootstrap|build-aux/install-icc.sh)                    \
+  unmarked_diagnostics=^(djgpp/|doc/bison.texi$$|tests/c\+\+\.at$$)                     \
 )
diff --git a/lib/lbitset.c b/lib/lbitset.c
index 935a8d1b..b835883f 100644
--- a/lib/lbitset.c
+++ b/lib/lbitset.c
@@ -887,7 +887,7 @@ lbitset_ones (bitset dst)
      bitset!  It makes a sparse bitset become dense.  An alternative
      is to have a flag that indicates that the bitset stores the
      complement of what it indicates.  */
-  
+
   bitset_windex windex
     = (BITSET_SIZE_ (dst) + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS;
 
diff --git a/tests/c++.at b/tests/c++.at
index 33fbd52e..2ce7b294 100644
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -453,7 +453,8 @@ AT_FULL_COMPILE([list])
 
 # Are we compiling with modern C++ enabled?
 AT_COMPILE_CXX([modern])
-AT_CHECK([./modern], [ignore], [ignore])
+here=. # Pacify cfg.mk's sc_at_parser_check.
+AT_CHECK([$here/modern], [ignore], [ignore])
 if test $at_status = 0; then
   modern=true
 else