diff --git a/mps/code/fmtdytst.h b/mps/code/fmtdytst.h
index 36914e92fc5..10078bbd2c7 100644
--- a/mps/code/fmtdytst.h
+++ b/mps/code/fmtdytst.h
@@ -1,6 +1,6 @@
 /* fmtdytst.h: DYLAN OBJECT FORMAT TESTING
  *
- * $Id: //info.ravenbrook.com/project/mps/master/code/fmtdy.h#7 $
+ * $Id$
  * Copyright (c) 2001 Ravenbrook Limited.  See end of file for license.
  */
 
diff --git a/mps/code/poolamc.c b/mps/code/poolamc.c
index 2a1720ebbc0..df0716571cb 100644
--- a/mps/code/poolamc.c
+++ b/mps/code/poolamc.c
@@ -1059,14 +1059,18 @@ static Res AMCWhiten(Pool pool, Trace trace, Seg seg)
       AVER(BufferIsReady(buffer));
       BufferDetach(buffer, pool);
     } else {                        /* mutator buffer */
-      if (BufferScanLimit(buffer) == SegBase(seg))
+      if (BufferScanLimit(buffer) == SegBase(seg)) {
         /* There's nothing but the buffer, don't condemn. */
         return ResOK;
-      else /* if (BufferScanLimit(buffer) == BufferLimit(buffer)) { */
+      }
+      /* [The following else-if section is just a comment added in */
+      /*  1998-10-08.  It has never worked.  RHSK 2007-01-16] */
+      /* else if (BufferScanLimit(buffer) == BufferLimit(buffer)) { */
         /* The buffer is full, so it won't be used by the mutator. */
         /* @@@@ We should detach it, but can't for technical reasons. */
         /* BufferDetach(buffer, pool); */
-      /* } else */ {
+      /* } */
+      else {
         /* There is an active buffer, make sure it's nailed. */
         if (!amcSegHasNailboard(seg)) {
           if (SegNailed(seg) == TraceSetEMPTY) {
@@ -1093,8 +1097,8 @@ static Res AMCWhiten(Pool pool, Trace trace, Seg seg)
         }
         /* We didn't condemn the buffer, subtract it from the count. */
         /* @@@@ We could subtract all the nailed grains. */
-	/* Relies on unsigned arithmetic wrapping round */
-	/* on under- and overflow (which it does). */
+        /* Relies on unsigned arithmetic wrapping round */
+        /* on under- and overflow (which it does). */
         trace->condemned -= AddrOffset(BufferScanLimit(buffer),
                                        BufferLimit(buffer));
       }
diff --git a/mps/code/protxcpp.c b/mps/code/protxcpp.c
index 5a7c2a237b8..2ba239fa2a3 100644
--- a/mps/code/protxcpp.c
+++ b/mps/code/protxcpp.c
@@ -1,6 +1,6 @@
 /* protxcpp.c: PROTECTION FOR MAC OS X ON POWERPC
  *
- *  $Header$
+ *  $Id$
  *  Copyright (c) 2001,2005 Ravenbrook Limited.  See end of file for license.
  *
  *  Most of this was copied from protso.c and modified.