diff --git a/ChangeLog b/ChangeLog
index 655b24725..49f3c3919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-29  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
+	* src/tgbatest/ltl2tgba.cc: Fix lines longer than 80 chars.
+	* src/sanity/80columns.test: Use expand to untabify, the previous
+	recipe was incomplete.
+
 	* src/tgbaalgos/replayrun.cc (replay_tgba_run): Note duplicate states.
 
 	* src/tgbaalgos/replayrun.cc (replay_tgba_run): Verify the run is
diff --git a/src/sanity/80columns.test b/src/sanity/80columns.test
index 1028d84c0..489659682 100755
--- a/src/sanity/80columns.test
+++ b/src/sanity/80columns.test
@@ -4,18 +4,6 @@
 
 set -e
 
-untabify()
-{
-  perl -pe 's/^((.{8})*)\t/$1        /g;
-            s/^(.(.{8})*)\t/$1       /g;
-            s/^(..(.{8})*)\t/$1      /g;
-            s/^(...(.{8})*)\t/$1     /g;
-            s/^(....(.{8})*)\t/$1    /g;
-            s/^(.....(.{8})*)\t/$1   /g;
-            s/^(......(.{8})*)\t/$1  /g;
-            s/^(.......(.{8})*)\t/$1 /g;' $1
-}
-
 rm -f failures
 
 for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do
@@ -24,7 +12,7 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do
 		 -o -name "${1-*}.test" \) -a -type f -a -print |
   while read file; do
      x='........................................'
-     if (untabify $file | grep -q $x.$x) 2>/dev/null; then
+     if (expand $file | grep -q $x.$x) 2>/dev/null; then
 	if grep 'GNU Bison' "$file" >/dev/null ||
 	   grep 'generated by flex' "$file" >/dev/null ; then
 	  :
diff --git a/src/tgbatest/ltl2tgba.cc b/src/tgbatest/ltl2tgba.cc
index 3f84d7a86..7952735b4 100644
--- a/src/tgbatest/ltl2tgba.cc
+++ b/src/tgbatest/ltl2tgba.cc
@@ -445,14 +445,16 @@ main(int argc, char** argv)
 
 	      if (reduc_aut & (spot::Reduce_quotient_Dir_Sim |
 			       spot::Reduce_transition_Dir_Sim))
-		rel_dir = spot::get_direct_relation_simulation(a,
-							       std::cout,
-							       display_parity_game);
+		rel_dir =
+		  spot::get_direct_relation_simulation(a,
+						       std::cout,
+						       display_parity_game);
 	      else if (reduc_aut & (spot::Reduce_quotient_Del_Sim |
 				    spot::Reduce_transition_Del_Sim))
-		rel_del = spot::get_delayed_relation_simulation(a,
-								std::cout,
-								display_parity_game);
+		rel_del =
+		  spot::get_delayed_relation_simulation(a,
+							std::cout,
+							display_parity_game);
 
 	      if (display_rel_sim)
 		{