diff --git a/ChangeLog b/ChangeLog
index 8340bfd3..4b9bb5ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-04  Akim Demaille  <demaille@gostai.com>
+
+	lalr1.cc: minor refactoring.
+	* data/lalr1.cc: Don't issue empty namespaces.
+
 2010-05-04  Akim Demaille  <demaille@gostai.com>
 
 	tests: fix %printer.
diff --git a/data/lalr1.cc b/data/lalr1.cc
index deab8639..b0b075ca 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -152,9 +152,9 @@ dnl FIXME: This is wrong, we want computed header guards.
 ]b4_locations_if([#include "location.hh"])[
 #include "stack.hh"
 
-]b4_namespace_open[
-]b4_variant_if([b4_variant_define])[
-]b4_namespace_close[
+]b4_variant_if([b4_namespace_open
+b4_variant_define
+b4_namespace_close])[
 
 /* Enabling traces.  */
 #ifndef YYDEBUG