diff --git a/code/alieneval.lisp b/code/alieneval.lisp
index 23cc672de19ac2f08f4beb2eef1e978f6ba3365c..8d5a5c8411cdf1a36416f62a193dd8fda54a40b1 100644
--- a/code/alieneval.lisp
+++ b/code/alieneval.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alieneval.lisp,v 1.67 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alieneval.lisp,v 1.68 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -323,7 +323,7 @@
 ;;; PARSE-ALIEN-TYPE -- public
 ;;;
 (defun parse-alien-type (type)
-  _N"Parse the list structure TYPE as an alien type specifier and return
+  "Parse the list structure TYPE as an alien type specifier and return
    the resultant alien-type structure."
   (if (boundp '*new-auxiliary-types*)
       (%parse-alien-type type)
@@ -400,7 +400,7 @@
 ;;; UNPARSE-ALIEN-TYPE -- public.
 ;;; 
 (defun unparse-alien-type (type)
-  _N"Convert the alien-type structure TYPE back into a list specification of
+  "Convert the alien-type structure TYPE back into a list specification of
    the type."
   (declare (type alien-type type))
   (let ((*record-types-already-unparsed* nil))
@@ -447,7 +447,7 @@
 
 
 (defmacro def-alien-type (name type)
-  _N"Define the alien type NAME to be equivalent to TYPE.  Name may be NIL for
+  "Define the alien type NAME to be equivalent to TYPE.  Name may be NIL for
    STRUCT and UNION types, in which case the name is taken from the type
    specifier."
   (with-auxiliary-alien-types
@@ -491,14 +491,14 @@
 ;;;; Interfaces to the different methods
 
 (defun alien-type-= (type1 type2)
-  _N"Return T iff TYPE1 and TYPE2 describe equivalent alien types."
+  "Return T iff TYPE1 and TYPE2 describe equivalent alien types."
   (or (eq type1 type2)
       (and (eq (alien-type-class type1)
 	       (alien-type-class type2))
 	   (invoke-alien-type-method :type= type1 type2))))
 
 (defun alien-subtype-p (type1 type2)
-  _N"Return T iff the alien type TYPE1 is a subtype of TYPE2.  Currently, the
+  "Return T iff the alien type TYPE1 is a subtype of TYPE2.  Currently, the
    only supported subtype relationships are that any pointer type is a
    subtype of (* t), and any array type's first dimension will match 
    (array <eltype> nil ...).  Otherwise, the two types have to be
@@ -507,7 +507,7 @@
       (invoke-alien-type-method :subtypep type1 type2)))
 
 (defun alien-typep (object type)
-  _N"Return T iff OBJECT is an alien of type TYPE."
+  "Return T iff OBJECT is an alien of type TYPE."
   (let ((lisp-rep-type (compute-lisp-rep-type type)))
     (if lisp-rep-type
 	(typep object lisp-rep-type)
@@ -1199,10 +1199,10 @@
 		     (alien-record-field-type field2))))
 
 (defvar *match-history* nil
-  _N"A hash table used to detect cycles while comparing record types.")
+  "A hash table used to detect cycles while comparing record types.")
 
 (defun in-match-history-or (type1 type2 alternative)
-  _N"Test if TYPE1 and TYPE2 are in the *MATCH-HISTORY*.
+  "Test if TYPE1 and TYPE2 are in the *MATCH-HISTORY*.
 If so return true; otherwise call ALTERNATIVE."
   (cond (*match-history*
 	 (let ((list (gethash type1 *match-history*)))
@@ -1374,7 +1374,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;; DEF-ALIEN-VARIABLE -- public
 ;;;
 (defmacro def-alien-variable (name type)
-  _N"Define NAME as an external alien variable of type TYPE.  NAME should be
+  "Define NAME as an external alien variable of type TYPE.  NAME should be
    a list of a string holding the alien name and a symbol to use as the Lisp
    name.  If NAME is just a symbol or string, then the other name is guessed
    from the one supplied."
@@ -1406,7 +1406,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;; EXTERN-ALIEN -- public.
 ;;; 
 (defmacro extern-alien (name type)
-  _N"Access the alien variable named NAME, assuming it is of type TYPE.  This
+  "Access the alien variable named NAME, assuming it is of type TYPE.  This
    is SETFable."
   (let* ((alien-name (etypecase name
 		       (symbol (guess-alien-name-from-lisp-name name))
@@ -1423,7 +1423,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;; WITH-ALIEN -- public.
 ;;;
 (defmacro with-alien (bindings &body body)
-  _N"Establish some local alien variables.  Each BINDING is of the form:
+  "Establish some local alien variables.  Each BINDING is of the form:
      VAR TYPE [ ALLOCATION ] [ INITIAL-VALUE | EXTERNAL-NAME ]
    ALLOCATION should be one of:
      :LOCAL (the default)
@@ -1522,12 +1522,12 @@ If so return true; otherwise call ALTERNATIVE."
 
 (declaim (inline null-alien))
 (defun null-alien (x)
-  _N"Return true if X (which must be an Alien pointer) is null, false otherwise."
+  "Return true if X (which must be an Alien pointer) is null, false otherwise."
   (zerop (sap-int (alien-sap x))))
 
   
 (defmacro sap-alien (sap type)
-  _N"Convert the System-Area-Pointer SAP to an Alien of the specified Type (not
+  "Convert the System-Area-Pointer SAP to an Alien of the specified Type (not
    evaluated.)  Type must be pointer-like."
   (let ((alien-type (parse-alien-type type)))
     (if (eq (compute-alien-rep-type alien-type) 'system-area-pointer)
@@ -1540,7 +1540,7 @@ If so return true; otherwise call ALTERNATIVE."
   (make-alien-value :sap sap :type type))
 
 (defun alien-sap (alien)
-  _N"Return a System-Area-Pointer pointing to Alien's data."
+  "Return a System-Area-Pointer pointing to Alien's data."
   (declare (type alien-value alien))
   (alien-value-sap alien))
 
@@ -1551,7 +1551,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;; MAKE-ALIEN -- public.
 ;;; 
 (defmacro make-alien (type &optional size)
-  _N"Allocate an alien of type TYPE and return an alien pointer to it.  If SIZE
+  "Allocate an alien of type TYPE and return an alien pointer to it.  If SIZE
    is supplied, how it is interpreted depends on TYPE.  If TYPE is an array
    type, SIZE is used as the first dimension for the allocated array.  If TYPE
    is not an array, then SIZE is the number of elements to allocate.  The
@@ -1603,7 +1603,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;;
 (declaim (inline free-alien))
 (defun free-alien (alien)
-  _N"Dispose of the storage pointed to by ALIEN.  ALIEN must have been allocated
+  "Dispose of the storage pointed to by ALIEN.  ALIEN must have been allocated
    by MAKE-ALIEN or ``malloc''."
   (alien-funcall (extern-alien "free" (function (values) system-area-pointer))
 		 (alien-sap alien))
@@ -1629,7 +1629,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;; alien is actually a pointer, then deref it first.
 ;;; 
 (defun slot (alien slot)
-  _N"Extract SLOT from the Alien STRUCT or UNION ALIEN.  May be set with SETF."
+  "Extract SLOT from the Alien STRUCT or UNION ALIEN.  May be set with SETF."
   (declare (type alien-value alien)
 	   (type symbol slot)
 	   (optimize (inhibit-warnings 3)))
@@ -1735,7 +1735,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;; Dereference the alien and return the results.
 ;;; 
 (defun deref (alien &rest indices)
-  _N"De-reference an Alien pointer or array.  If an array, the indices are used
+  "De-reference an Alien pointer or array.  If an array, the indices are used
    as the indices of the array element to access.  If a pointer, one index can
    optionally be specified, giving the equivalent of C pointer arithmetic."
   (declare (type alien-value alien)
@@ -1866,7 +1866,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;;; The ADDR macro.
 
 (defmacro addr (expr &environment env)
-  _N"Return an Alien pointer to the data addressed by Expr, which must be a call
+  "Return an Alien pointer to the data addressed by Expr, which must be a call
    to SLOT or DEREF, or a reference to an Alien variable."
   (let ((form (macroexpand expr env)))
     (or (typecase form
@@ -1899,7 +1899,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;;; The CAST macro.
 
 (defmacro cast (alien type)
-  _N"Convert ALIEN to an Alien of the specified TYPE (not evaluated).  Both types
+  "Convert ALIEN to an Alien of the specified TYPE (not evaluated).  Both types
    must be Alien array, pointer or function types."
   `(%cast ,alien ',(parse-alien-type type)))
 
@@ -1924,7 +1924,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;;; The ALIEN-SIZE macro.
 
 (defmacro alien-size (type &optional (units :bits))
-  _N"Return the size of the alien type TYPE.  UNITS specifies the units to
+  "Return the size of the alien type TYPE.  UNITS specifies the units to
    use and can be either :BITS, :BYTES, or :WORDS."
   (let* ((alien-type (parse-alien-type type))
 	 (bits (alien-type-bits alien-type)))
@@ -1970,7 +1970,7 @@ If so return true; otherwise call ALTERNATIVE."
 ;;;; alien-funcall, def-alien-function
 
 (defun alien-funcall (alien &rest args)
-  _N"Call the foreign function ALIEN with the specified arguments.  ALIEN's
+  "Call the foreign function ALIEN with the specified arguments.  ALIEN's
    type specifies the argument and result types."
   (declare (type alien-value alien))
   (let ((type (alien-value-type alien)))
@@ -1999,7 +1999,7 @@ If so return true; otherwise call ALTERNATIVE."
        (error _"~S is not an alien function." alien)))))
 
 (defmacro def-alien-routine (name result-type &rest args)
-  _N"Def-Alien-Routine Name Result-Type
+  "Def-Alien-Routine Name Result-Type
                     {(Arg-Name Arg-Type [Style])}*
 
   Define a foreign interface function for the routine with the specified Name,
@@ -2157,7 +2157,7 @@ If so return true; otherwise call ALTERNATIVE."
 
 (defstruct (callback
 	     (:constructor make-callback (trampoline lisp-fn function-type)))
-  _N"A callback consists of a piece assembly code -- the trampoline --
+  "A callback consists of a piece assembly code -- the trampoline --
 and a lisp function.  We store the function type (including return
 type and arg types), so we can detect incompatible redefinitions."
   (trampoline (required-argument) :type system-area-pointer)
@@ -2167,7 +2167,7 @@ type and arg types), so we can detect incompatible redefinitions."
 (declaim (type (vector callback) *callbacks*))
 (defvar *callbacks* (make-array 10 :element-type 'callback
 				:fill-pointer 0 :adjustable t)
-  _N"Vector of all callbacks.")
+  "Vector of all callbacks.")
 
 (defun call-callback (index sp-fixnum ret-addr)
   (declare (type fixnum index sp-fixnum ret-addr)
@@ -2242,7 +2242,7 @@ type and arg types), so we can detect incompatible redefinitions."
   (callback-trampoline (symbol-value symbol)))
 
 (defmacro callback (name)
-  _N"Return the trampoline pointer for the callback NAME."
+  "Return the trampoline pointer for the callback NAME."
   `(symbol-trampoline ',name))
 
 ;; Convenience macro to make it easy to call callbacks.
@@ -2314,7 +2314,7 @@ Create new trampoline (old trampoline calls old lisp function).")))
 	(t (error _"Unsupported return type: ~A" spec))))))
 
 (defmacro def-callback (name (return-type &rest arg-specs) &parse-body (body decls doc))
-  _N"(defcallback NAME (RETURN-TYPE {(ARG-NAME ARG-TYPE)}*)
+  "(defcallback NAME (RETURN-TYPE {(ARG-NAME ARG-TYPE)}*)
      {doc-string} {decls}* {FORM}*)
 
 Define a function which can be called by foreign code.  The pointer
diff --git a/code/alpha-vm.lisp b/code/alpha-vm.lisp
index 251e5ddfd6b441839a395247e50d8dfa4a136293..35cea6ec1cc9496355fd30bb8594bcfef2eb4fb1 100644
--- a/code/alpha-vm.lisp
+++ b/code/alpha-vm.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alpha-vm.lisp,v 1.6 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alpha-vm.lisp,v 1.7 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alpha-vm.lisp,v 1.6 2010/03/19 15:18:58 rtoy Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alpha-vm.lisp,v 1.7 2010/04/19 02:18:03 rtoy Exp $
 ;;;
 ;;; This file contains the Alpha specific runtime stuff.
 ;;;
@@ -62,11 +62,11 @@
 ;;;; MACHINE-TYPE and MACHINE-VERSION
 
 (defun machine-type ()
-  _N"Returns a string describing the type of the local machine."
+  "Returns a string describing the type of the local machine."
   "DECstation")
 
 (defun machine-version ()
-  _N"Returns a string describing the version of the local machine."
+  "Returns a string describing the version of the local machine."
   "DECstation")
 
 
diff --git a/code/amd64-vm.lisp b/code/amd64-vm.lisp
index 6ccb7d72173d7589596c3c3d7c340fa61e6b786f..634723885528b0c77788d440b7c5937014f3594c 100644
--- a/code/amd64-vm.lisp
+++ b/code/amd64-vm.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/amd64-vm.lisp,v 1.5 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/amd64-vm.lisp,v 1.6 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -174,13 +174,13 @@
 
 #-cross-compiler
 (defun machine-type ()
-  _N"Returns a string describing the type of the local machine."
+  "Returns a string describing the type of the local machine."
   "AMD x86-64")
 
 
 #-cross-compiler
 (defun machine-version ()
-  _N"Returns a string describing the version of the local machine."
+  "Returns a string describing the version of the local machine."
   "AMD x86-64")
 
 
@@ -539,36 +539,36 @@
 (defun %instance-set-conditional (object slot test-value new-value)
   (declare (type instance object)
 	   (type index slot))
-  _N"Atomically compare object's slot value to test-value and if EQ store
+  "Atomically compare object's slot value to test-value and if EQ store
    new-value in the slot. The original value of the slot is returned."
   (%instance-set-conditional object slot test-value new-value))
 
 (defun set-symbol-value-conditional (symbol test-value new-value)
   (declare (type symbol symbol))
-  _N"Atomically compare symbol's value to test-value and if EQ store
+  "Atomically compare symbol's value to test-value and if EQ store
   new-value in symbol's value slot and return the original value."
   (set-symbol-value-conditional symbol test-value new-value))
 
 (defun rplaca-conditional (cons test-value new-value)
   (declare (type cons cons))
-  _N"Atomically compare the car of CONS to test-value and if EQ store
+  "Atomically compare the car of CONS to test-value and if EQ store
   new-value its car and return the original value."
   (rplaca-conditional cons test-value new-value))
 
 (defun rplacd-conditional (cons test-value new-value)
   (declare (type cons cons))
-  _N"Atomically compare the cdr of CONS to test-value and if EQ store
+  "Atomically compare the cdr of CONS to test-value and if EQ store
   new-value its cdr and return the original value."
   (rplacd-conditional cons test-value new-value))
 
 (defun data-vector-set-conditional (vector index test-value new-value)
   (declare (type simple-vector vector))
-  _N"Atomically compare an element of vector to test-value and if EQ store
+  "Atomically compare an element of vector to test-value and if EQ store
   new-value the element and return the original value."
   (data-vector-set-conditional vector index test-value new-value))
 
 (defmacro atomic-push-symbol-value (val symbol)
-  _N"Thread safe push of val onto the list in the symbol global value."
+  "Thread safe push of val onto the list in the symbol global value."
   (ext:once-only ((n-val val))
     (let ((new-list (gensym))
 	  (old-list (gensym)))
@@ -582,7 +582,7 @@
 	      (return ,new-list))))))))
 
 (defmacro atomic-pop-symbol-value (symbol)
-  _N"Thread safe pop from the list in the symbol global value."
+  "Thread safe pop from the list in the symbol global value."
   (let ((new-list (gensym))
 	(old-list (gensym)))
     `(loop
@@ -594,7 +594,7 @@
 	  (return (car ,old-list)))))))
 
 (defmacro atomic-pusha (val cons)
-  _N"Thread safe push of val onto the list in the car of cons."
+  "Thread safe push of val onto the list in the car of cons."
   (once-only ((n-val val)
 	      (n-cons cons))
     (let ((new-list (gensym))
@@ -608,7 +608,7 @@
 	      (return ,new-list))))))))
 
 (defmacro atomic-pushd (val cons)
-  _N"Thread safe push of val onto the list in the cdr of cons."
+  "Thread safe push of val onto the list in the cdr of cons."
   (once-only ((n-val val)
 	      (n-cons cons))
     (let ((new-list (gensym))
@@ -622,7 +622,7 @@
 	      (return ,new-list))))))))
 
 (defmacro atomic-push-vector (val vect index)
-  _N"Thread safe push of val onto the list in the vector element."
+  "Thread safe push of val onto the list in the vector element."
   (once-only ((n-val val)
 	      (n-vect vect)
 	      (n-index index))
diff --git a/code/array.lisp b/code/array.lisp
index a6752f5b0fc51639cbd5c62b9651b8980fb82e5d..c2cc024f358c3c53ce24ecf257a2fdcc1d713689 100644
--- a/code/array.lisp
+++ b/code/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/array.lisp,v 1.52 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/array.lisp,v 1.53 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -34,13 +34,13 @@
 		 array-displacement))
 
 (defconstant array-rank-limit 65529
-  _N"The exclusive upper bound on the rank of an array.")
+  "The exclusive upper bound on the rank of an array.")
 
 (defconstant array-dimension-limit most-positive-fixnum
-  _N"The exclusive upper bound any given dimension of an array.")
+  "The exclusive upper bound any given dimension of an array.")
 
 (defconstant array-total-size-limit most-positive-fixnum
-  _N"The exclusive upper bound on the total number of elements in an array.")
+  "The exclusive upper bound on the total number of elements in an array.")
 
 
 
@@ -161,7 +161,7 @@
     (t #.vm:complex-vector-type)))
 
 (defvar *static-vectors* nil
-  _N"List of weak-pointers to static vectors.  Needed for GCing static vectors")
+  "List of weak-pointers to static vectors.  Needed for GCing static vectors")
 
 (defun make-static-vector (length element-type)
   (multiple-value-bind (type bits)
@@ -219,7 +219,7 @@
                               adjustable fill-pointer
 			      displaced-to displaced-index-offset
 		              allocation)
-  _N"Creates an array of the specified Dimensions and properties.  See the
+  "Creates an array of the specified Dimensions and properties.  See the
   manual for details.
 
   :Element-type
@@ -466,7 +466,7 @@
 
 
 (defun vector (&rest objects)
-  _N"Constructs a simple-vector from the given objects."
+  "Constructs a simple-vector from the given objects."
   (coerce (the list objects) 'simple-vector))
 
 
@@ -576,7 +576,7 @@
 	  index))))
 
 (defun array-in-bounds-p (array &rest subscripts)
-  _N"Returns T if the Subscipts are in bounds for the Array, Nil otherwise."
+  "Returns T if the Subscipts are in bounds for the Array, Nil otherwise."
   (if (%array-row-major-index array subscripts nil)
       t))
 
@@ -584,7 +584,7 @@
   (%array-row-major-index array subscripts))
 
 (defun aref (array &rest subscripts)
-  _N"Returns the element of the Array specified by the Subscripts."
+  "Returns the element of the Array specified by the Subscripts."
   (row-major-aref array (%array-row-major-index array subscripts)))
 
 (defun %aset (array &rest stuff)
@@ -600,7 +600,7 @@
 	new-value))
 
 (defun row-major-aref (array index)
-  _N"Returns the element of array corressponding to the row-major index.  This is
+  "Returns the element of array corressponding to the row-major index.  This is
    SETF'able."
   (declare (optimize (safety 1)))
   (row-major-aref array index))
@@ -611,7 +611,7 @@
   (setf (row-major-aref array index) new-value))
 
 (defun svref (simple-vector index)
-  _N"Returns the Index'th element of the given Simple-Vector."
+  "Returns the Index'th element of the given Simple-Vector."
   (declare (optimize (safety 1)))
   (aref simple-vector index))
 
@@ -621,7 +621,7 @@
 
 
 (defun bit (bit-array &rest subscripts)
-  _N"Returns the bit from the Bit-Array at the specified Subscripts."
+  "Returns the bit from the Bit-Array at the specified Subscripts."
   (declare (type (array bit) bit-array) (optimize (safety 1)))
   (row-major-aref bit-array (%array-row-major-index bit-array subscripts)))
 
@@ -642,7 +642,7 @@
 	new-value))
 
 (defun sbit (simple-bit-array &rest subscripts)
-  _N"Returns the bit from the Simple-Bit-Array at the specified Subscripts."
+  "Returns the bit from the Simple-Bit-Array at the specified Subscripts."
   (declare (type (simple-array bit) simple-bit-array) (optimize (safety 1)))
   (row-major-aref simple-bit-array
 		  (%array-row-major-index simple-bit-array subscripts)))
@@ -666,7 +666,7 @@
 ;;;; Random array properties.
 
 (defun array-element-type (array)
-  _N"Returns the type of the elements of the array"
+  "Returns the type of the elements of the array"
   (let ((type (get-type array)))
     (macrolet ((pick-element-type (&rest stuff)
 		 `(cond ,@(mapcar #'(lambda (stuff)
@@ -717,13 +717,13 @@
 
 
 (defun array-rank (array)
-  _N"Returns the number of dimensions of the Array."
+  "Returns the number of dimensions of the Array."
   (if (array-header-p array)
       (%array-rank array)
       1))
 
 (defun array-dimension (array axis-number)
-  _N"Returns length of dimension Axis-Number of the Array."
+  "Returns length of dimension Axis-Number of the Array."
   (declare (array array) (type index axis-number))
   (cond ((not (array-header-p array))
 	 (unless (= axis-number 0)
@@ -738,7 +738,7 @@
 	 (%array-dimension array axis-number))))
 
 (defun array-dimensions (array)
-  _N"Returns a list whose elements are the dimensions of the array"
+  "Returns a list whose elements are the dimensions of the array"
   (declare (array array))
   (if (array-header-p array)
       (do ((results nil (cons (array-dimension array index) results))
@@ -747,14 +747,14 @@
       (list (array-dimension array 0))))
 
 (defun array-total-size (array)
-  _N"Returns the total number of elements in the Array."
+  "Returns the total number of elements in the Array."
   (declare (array array))
   (if (array-header-p array)
       (%array-available-elements array)
       (length (the vector array))))
 
 (defun array-displacement (array)
-  _N"Returns values of :displaced-to and :displaced-index-offset options to
+  "Returns values of :displaced-to and :displaced-index-offset options to
    make-array, or the defaults nil and 0 if not a displaced array."
   (declare (array array))
   (if (and (array-header-p array) (%array-displaced-p array))
@@ -763,7 +763,7 @@
       (values nil 0)))
 
 (defun adjustable-array-p (array)
-  _N"Returns T if (adjust-array array...) would return an array identical
+  "Returns T if (adjust-array array...) would return an array identical
    to the argument, this happens for complex arrays."
   (declare (array array))
   (not (typep array 'simple-array)))
@@ -772,12 +772,12 @@
 ;;;; Fill pointer frobbing stuff.
 
 (defun array-has-fill-pointer-p (array)
-  _N"Returns T if the given Array has a fill pointer, or Nil otherwise."
+  "Returns T if the given Array has a fill pointer, or Nil otherwise."
   (declare (array array))
   (and (array-header-p array) (%array-fill-pointer-p array)))
 
 (defun fill-pointer (vector)
-  _N"Returns the Fill-Pointer of the given Vector."
+  "Returns the Fill-Pointer of the given Vector."
   (declare (vector vector))
   (if (and (array-header-p vector) (%array-fill-pointer-p vector))
       (%array-fill-pointer vector)
@@ -803,7 +803,7 @@
 	     :format-arguments (list vector))))
 
 (defun vector-push (new-el array)
-  _N"Attempts to set the element of Array designated by the fill pointer
+  "Attempts to set the element of Array designated by the fill pointer
    to New-El and increment fill pointer by one.  If the fill pointer is
    too large, Nil is returned, otherwise the index of the pushed element is 
    returned."
@@ -821,7 +821,7 @@
 				  (extension (if (zerop (length array))
 						 1
 						 (length array))))
-  _N"Like Vector-Push except that if the fill pointer gets too large, the
+  "Like Vector-Push except that if the fill pointer gets too large, the
    Array is extended rather than Nil being returned."
   (declare (vector array) (fixnum extension))
   (let ((fill-pointer (fill-pointer array)))
@@ -833,7 +833,7 @@
     fill-pointer))
 
 (defun vector-pop (array)
-  _N"Attempts to decrease the fill-pointer by 1 and return the element
+  "Attempts to decrease the fill-pointer by 1 and return the element
    pointer to by the new fill pointer.  If the original value of the fill
    pointer is 0, an error occurs."
   (declare (vector array))
@@ -854,7 +854,7 @@
 			   (initial-contents nil initial-contents-p)
                            fill-pointer
 			   displaced-to displaced-index-offset)
-  _N"Adjusts the Array's dimensions to the given Dimensions and stuff."
+  "Adjusts the Array's dimensions to the given Dimensions and stuff."
   (let ((dimensions (if (listp dimensions) dimensions (list dimensions))))
     (cond ((/= (the fixnum (length (the list dimensions)))
 	       (the fixnum (array-rank array)))
@@ -1008,7 +1008,7 @@
                                fill-pointer))))
 
 (defun shrink-vector (vector new-size)
-  _N"Destructively alters the Vector, changing its length to New-Size, which
+  "Destructively alters the Vector, changing its length to New-Size, which
    must be less than or equal to its current size."
   (declare (vector vector))
   (unless (array-header-p vector)
@@ -1057,7 +1057,7 @@
 
 (defun set-array-header (array data length fill-pointer displacement dimensions
 			 &optional displacedp)
-  _N"Fills in array header with provided information.  Returns array."
+  "Fills in array header with provided information.  Returns array."
   (setf (%array-data-vector array) data)
   (setf (%array-available-elements array) length)
   (cond (fill-pointer
@@ -1239,7 +1239,7 @@
 (def-bit-array-op bit-orc2 logorc2)
 
 (defun bit-not (bit-array &optional result-bit-array)
-  _N"Performs a bit-wise logical NOT on the elements of BIT-ARRAY,
+  "Performs a bit-wise logical NOT on the elements of BIT-ARRAY,
   putting the results in RESULT-BIT-ARRAY.  If RESULT-BIT-ARRAY is T,
   BIT-ARRAY is used.  If RESULT-BIT-ARRAY is NIL or omitted, a new array is
   created.  Both arrays must have the same rank and dimensions."
diff --git a/code/backq.lisp b/code/backq.lisp
index 7eaa4772dc4aa38168e8151a37505cd1a14a6796..fec41c152a385c91faa51f1fdd5bc6e2232f7dba 100644
--- a/code/backq.lisp
+++ b/code/backq.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/backq.lisp,v 1.15 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/backq.lisp,v 1.16 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -45,7 +45,7 @@
 ;;;<hair> involves starting over again pretending you had read ".,a)" instead
 ;;; of ",@a)"
 
-(defvar *backquote-count* 0  _N"How deep we are into backquotes")
+(defvar *backquote-count* 0  "How deep we are into backquotes")
 (defvar *bq-comma-flag* '(|,|))
 (defvar *bq-at-flag* '(|,@|))
 (defvar *bq-dot-flag* '(|,.|))
@@ -238,7 +238,7 @@
     ))
 
 (defun backq-unparse (form &optional splicing)
-  _N"Given a lisp form containing the magic functions BACKQ-LIST, BACKQ-LIST*,
+  "Given a lisp form containing the magic functions BACKQ-LIST, BACKQ-LIST*,
   BACKQ-APPEND, etc. produced by the backquote reader macro, will return a
   corresponding backquote input form.  In this form, `,' `,@' and `,.' are
   represented by lists whose cars are BACKQ-COMMA, BACKQ-COMMA-AT, and
diff --git a/code/bignum.lisp b/code/bignum.lisp
index b0efc060945768a7c096799349a24d976caf6234..910506b0ef04d604a51229d9cf92fcb7baab2f34 100644
--- a/code/bignum.lisp
+++ b/code/bignum.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bignum.lisp,v 1.48 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bignum.lisp,v 1.49 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -572,7 +572,7 @@
 ;; This might need some tuning
 (declaim (fixnum *karatsuba-classical-cutoff*))
 (defparameter *karatsuba-classical-cutoff* 10
-  _N"When the bignum pieces are smaller than this many words, we use the
+  "When the bignum pieces are smaller than this many words, we use the
 classical multiplication algorithm instead of recursing all the way
 down to individual words.")
 
@@ -917,7 +917,7 @@ down to individual words.")
     (%normalize-bignum res len-res)))
 
 (defparameter *min-karatsuba-bits* 512
-  _N"Use Karatsuba if the bignums have at least this many bits")
+  "Use Karatsuba if the bignums have at least this many bits")
 
 (defun multiply-bignums (a b)
   (declare (type bignum-type a b))
@@ -1137,7 +1137,7 @@ down to individual words.")
 ;;; Could do freelisting someday.
 ;;;
 (defmacro with-bignum-buffers (specs &body body)
-  _N"WITH-BIGNUM-BUFFERS ({(var size [init])}*) Form*"
+  "WITH-BIGNUM-BUFFERS ({(var size [init])}*) Form*"
   (ext:collect ((binds)
 		(inits))
     (dolist (spec specs)
diff --git a/code/bit-bash.lisp b/code/bit-bash.lisp
index 022e49de972fb5e1f1ee5d111077b6b41518aa73..c72af3eb3724e81a65b0bfe26f3481c10b107b24 100644
--- a/code/bit-bash.lisp
+++ b/code/bit-bash.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bit-bash.lisp,v 1.26 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bit-bash.lisp,v 1.27 2010/04/19 02:18:03 rtoy Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -25,10 +25,10 @@
 (eval-when (compile load eval)
 
 (defconstant unit-bits vm:word-bits
-  _N"The number of bits to process at a time.")
+  "The number of bits to process at a time.")
 
 (defconstant max-bits (1- (ash 1 vm:word-bits))
-  _N"The maximum number of bits that can be dealt with during a single call.")
+  "The maximum number of bits that can be dealt with during a single call.")
 
 
 (deftype unit ()
@@ -79,7 +79,7 @@
       (:little-endian little-endian))))
 
 (defun shift-towards-start (number count)
-  _N"Shift NUMBER by COUNT bits, adding zero bits at the ``end'' and removing
+  "Shift NUMBER by COUNT bits, adding zero bits at the ``end'' and removing
   bits from the ``start.''  On big-endian machines this is a left-shift and
   on little-endian machines this is a right-shift.  Note: only the low 5/6 bits
   of count are significant."
@@ -93,7 +93,7 @@
 	 (ash number (- count))))))
 
 (defun shift-towards-end (number count)
-  _N"Shift NUMBER by COUNT bits, adding zero bits at the ``start'' and removing
+  "Shift NUMBER by COUNT bits, adding zero bits at the ``start'' and removing
   bits from the ``end.''  On big-endian machines this is a right-shift and
   on little-endian machines this is a left-shift."
   (declare (type unit number) (fixnum count))
@@ -107,20 +107,20 @@
 
 (declaim (inline start-mask end-mask fix-sap-and-offset))
 (defun start-mask (count)
-  _N"Produce a mask that contains 1's for the COUNT ``start'' bits and 0's for
+  "Produce a mask that contains 1's for the COUNT ``start'' bits and 0's for
   the remaining ``end'' bits.  Only the lower 5 bits of COUNT are significant."
   (declare (fixnum count))
   (shift-towards-start (1- (ash 1 unit-bits)) (- count)))
 
 (defun end-mask (count)
-  _N"Produce a mask that contains 1's for the COUNT ``end'' bits and 0's for
+  "Produce a mask that contains 1's for the COUNT ``end'' bits and 0's for
   the remaining ``start'' bits.  Only the lower 5 bits of COUNT are
   significant."
   (declare (fixnum count))
   (shift-towards-end (1- (ash 1 unit-bits)) (- count)))
 
 (defun fix-sap-and-offset (sap offset)
-  _N"Align the SAP to a word boundry, and update the offset accordingly."
+  "Align the SAP to a word boundry, and update the offset accordingly."
   (declare (type system-area-pointer sap)
 	   (type index offset)
 	   (values system-area-pointer index))
@@ -157,7 +157,7 @@
 
 (declaim (inline do-constant-bit-bash))
 (defun do-constant-bit-bash (dst dst-offset length value dst-ref-fn dst-set-fn)
-  _N"Fill DST with VALUE starting at DST-OFFSET and continuing for LENGTH bits."
+  "Fill DST with VALUE starting at DST-OFFSET and continuing for LENGTH bits."
   (declare (type offset dst-offset) (type unit value)
 	   (type function dst-ref-fn dst-set-fn))
   (multiple-value-bind (dst-word-offset dst-bit-offset)
diff --git a/code/bsd-os.lisp b/code/bsd-os.lisp
index cff25b1d0c613b9f62fc4039ef90222291a8ae10..681506a2b91b62c7c101cd7e9b7fde9cbbe14c40 100644
--- a/code/bsd-os.lisp
+++ b/code/bsd-os.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bsd-os.lisp,v 1.14 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bsd-os.lisp,v 1.15 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -48,10 +48,10 @@
 		      #+Darwin "Darwin"
 		      #-(or freebsd NetBSD OpenBSD Darwin) "BSD")
 
-(defvar *software-version* nil _N"Version string for supporting software")
+(defvar *software-version* nil "Version string for supporting software")
 
 (defun software-version ()
-  _N"Returns a string describing version of the supporting software."
+  "Returns a string describing version of the supporting software."
   (unless *software-version*
     (setf *software-version*
 	  (string-trim '(#\newline)
diff --git a/code/byte-interp.lisp b/code/byte-interp.lisp
index eb7e4952611cd6ca341442d1aa450290e6ec2030..ac2ab17a959edd3c3974ff7cdd216e1ecae59041 100644
--- a/code/byte-interp.lisp
+++ b/code/byte-interp.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/byte-interp.lisp,v 1.47 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/byte-interp.lisp,v 1.48 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -191,11 +191,11 @@
 ;;;; The stack.
 
 (defvar *eval-stack* (make-array 100)
-  _N"This is the interpreter's evaluation stack.")
+  "This is the interpreter's evaluation stack.")
 (declaim (type simple-vector *eval-stack*))
 
 (defvar *eval-stack-top* 0
-  _N"This is the next free element of the interpreter's evaluation stack.")
+  "This is the next free element of the interpreter's evaluation stack.")
 (declaim (type index *eval-stack-top*))
 
 (defmacro current-stack-pointer () '*eval-stack-top*)
diff --git a/code/char.lisp b/code/char.lisp
index afdf00bf9c59147fe3206cad1b7275e1809282c2..49c4d5d8776c45e05173106d597eb369e64e89c2 100644
--- a/code/char.lisp
+++ b/code/char.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/char.lisp,v 1.19 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/char.lisp,v 1.20 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -47,14 +47,14 @@
 (defconstant char-code-limit
   #-unicode 256
   #+unicode 65536
-  _N"The upper exclusive bound on values produced by CHAR-CODE.")
+  "The upper exclusive bound on values produced by CHAR-CODE.")
 
 (deftype char-code ()
   `(integer 0 (,char-code-limit)))
 
 (defconstant codepoint-limit
   #x110000
-  _N"The upper exclusive bound on the value of a Unicode codepoint")
+  "The upper exclusive bound on the value of a Unicode codepoint")
 
 ;;; The range of a Unicode code point
 (deftype codepoint ()
@@ -69,7 +69,7 @@
 		   (dolist (name names)
 		     (results (cons name (code-char ccode))))))
 	       `(defparameter char-name-alist ',(results)
-  _N"This is the alist of (character-name . character) for characters with
+  "This is the alist of (character-name . character) for characters with
   long names.  The first name in this list for a given character is used
   on typeout and is the preferred form for input."))))
   ;; Note: the char-name listed here should be what string-capitalize
@@ -114,25 +114,25 @@
 ;;;; Accessor functions:
 
 (defun char-code (char)
-  _N"Returns the integer code of CHAR."
+  "Returns the integer code of CHAR."
   (etypecase char
     (base-char (char-code (truly-the base-char char)))))
 
 
 (defun char-int (char)
-  _N"Returns the integer code of CHAR.  This is the same as char-code, as
+  "Returns the integer code of CHAR.  This is the same as char-code, as
    CMU Common Lisp does not implement character bits or fonts."
   (char-code char))
 
 
 (defun code-char (code)
-  _N"Returns the character with the code CODE."
+  "Returns the character with the code CODE."
   (declare (type char-code code))
   (code-char code))
 
 
 (defun character (object)
-  _N"Coerces its argument into a character object if possible.  Accepts
+  "Coerces its argument into a character object if possible.  Accepts
   characters, strings and symbols of length 1."
   (flet ((do-error (control args)
 	   (error 'simple-type-error
@@ -155,7 +155,7 @@
 
 
 (defun char-name (char)
-  _N"Given a character object, char-name returns the name for that
+  "Given a character object, char-name returns the name for that
   object (a symbol)."
   (let ((name (car (rassoc char char-name-alist))))
     (if name
@@ -171,7 +171,7 @@
 	      (format nil "U+~4,'0X" code))))))
 
 (defun name-char (name)
-  _N"Given an argument acceptable to string, name-char returns a character
+  "Given an argument acceptable to string, name-char returns a character
   object whose name is that symbol, if one exists, otherwise NIL."
   (if (and (stringp name) (> (length name) 2) (string-equal name "U+" :end1 2))
       (code-char (parse-integer name :radix 16 :start 1))
@@ -188,7 +188,7 @@
 ;;;; Predicates:
 
 (defun standard-char-p (char)
-  _N"The argument must be a character object.  Standard-char-p returns T if the
+  "The argument must be a character object.  Standard-char-p returns T if the
    argument is a standard character -- one of the 95 ASCII printing characters
    or <return>."
   (declare (character char))
@@ -198,12 +198,12 @@
 	     (= n 10)))))
 
 (defun %standard-char-p (thing)
-  _N"Return T if and only if THING is a standard-char.  Differs from
+  "Return T if and only if THING is a standard-char.  Differs from
   standard-char-p in that THING doesn't have to be a character."
   (and (characterp thing) (standard-char-p thing)))
 
 (defun graphic-char-p (char)
-  _N"The argument must be a character object.  Graphic-char-p returns T if the
+  "The argument must be a character object.  Graphic-char-p returns T if the
   argument is a printing character, otherwise returns NIL."
   (declare (character char))
   (and (typep char 'base-char)
@@ -215,7 +215,7 @@
 
 
 (defun alpha-char-p (char)
-  _N"The argument must be a character object.  Alpha-char-p returns T if the
+  "The argument must be a character object.  Alpha-char-p returns T if the
   argument is an alphabetic character; otherwise NIL."
   (declare (character char))
   (let ((m (char-code char)))
@@ -227,7 +227,7 @@
 
 
 (defun upper-case-p (char)
-  _N"The argument must be a character object; upper-case-p returns T if the
+  "The argument must be a character object; upper-case-p returns T if the
   argument is an upper-case character, NIL otherwise."
   (declare (character char))
   (let ((m (char-code char)))
@@ -238,7 +238,7 @@
 
 
 (defun lower-case-p (char)
-  _N"The argument must be a character object; lower-case-p returns T if the 
+  "The argument must be a character object; lower-case-p returns T if the 
   argument is a lower-case character, NIL otherwise."
   (declare (character char))
   (let ((m (char-code char)))
@@ -248,7 +248,7 @@
 	     (= (unicode-category m) +unicode-category-lower+)))))
 
 (defun title-case-p (char)
-  _N"The argument must be a character object; title-case-p returns T if the
+  "The argument must be a character object; title-case-p returns T if the
   argument is a title-case character, NIL otherwise."
   (declare (character char))
   (let ((m (char-code char)))
@@ -259,7 +259,7 @@
 
 
 (defun both-case-p (char)
-  _N"The argument must be a character object.  Both-case-p returns T if the
+  "The argument must be a character object.  Both-case-p returns T if the
   argument is an alphabetic character and if the character exists in
   both upper and lower case.  For ASCII, this is the same as Alpha-char-p."
   (declare (character char))
@@ -273,7 +273,7 @@
 
 
 (defun digit-char-p (char &optional (radix 10.))
-  _N"If char is a digit in the specified radix, returns the fixnum for
+  "If char is a digit in the specified radix, returns the fixnum for
   which that digit stands, else returns NIL.  Radix defaults to 10
   (decimal)."
   (declare (character char) (type (integer 2 36) radix))
@@ -293,7 +293,7 @@
 
 
 (defun alphanumericp (char)
-  _N"Given a character-object argument, alphanumericp returns T if the
+  "Given a character-object argument, alphanumericp returns T if the
   argument is either numeric or alphabetic."
   (declare (character char))
   (let ((m (char-code char)))
@@ -306,14 +306,14 @@
 
 
 (defun char= (character &rest more-characters)
-  _N"Returns T if all of its arguments are the same character."
+  "Returns T if all of its arguments are the same character."
   (do ((clist more-characters (cdr clist)))
       ((atom clist) T)
     (unless (eq (car clist) character) (return nil))))
 
 
 (defun char/= (character &rest more-characters)
-  _N"Returns T if no two of its arguments are the same character."
+  "Returns T if no two of its arguments are the same character."
   (do* ((head character (car list))
 	(list more-characters (cdr list)))
        ((atom list) T)
@@ -324,7 +324,7 @@
 
 
 (defun char< (character &rest more-characters)
-  _N"Returns T if its arguments are in strictly increasing alphabetic order."
+  "Returns T if its arguments are in strictly increasing alphabetic order."
   (do* ((c character (car list))
 	(list more-characters (cdr list)))
        ((atom list) T)
@@ -334,7 +334,7 @@
 
 
 (defun char> (character &rest more-characters)
-  _N"Returns T if its arguments are in strictly decreasing alphabetic order."
+  "Returns T if its arguments are in strictly decreasing alphabetic order."
   (do* ((c character (car list))
 	(list more-characters (cdr list)))
        ((atom list) T)
@@ -344,7 +344,7 @@
 
 
 (defun char<= (character &rest more-characters)
-  _N"Returns T if its arguments are in strictly non-decreasing alphabetic order."
+  "Returns T if its arguments are in strictly non-decreasing alphabetic order."
   (do* ((c character (car list))
 	(list more-characters (cdr list)))
        ((atom list) T)
@@ -354,7 +354,7 @@
 
 
 (defun char>= (character &rest more-characters)
-  _N"Returns T if its arguments are in strictly non-increasing alphabetic order."
+  "Returns T if its arguments are in strictly non-increasing alphabetic order."
   (do* ((c character (car list))
 	(list more-characters (cdr list)))
        ((atom list) T)
@@ -379,7 +379,7 @@
 
 
 (defun char-equal (character &rest more-characters)
-  _N"Returns T if all of its arguments are the same character.
+  "Returns T if all of its arguments are the same character.
    Case is ignored."
   (do ((clist more-characters (cdr clist)))
       ((atom clist) T)
@@ -389,7 +389,7 @@
 
 
 (defun char-not-equal (character &rest more-characters)
-  _N"Returns T if no two of its arguments are the same character.
+  "Returns T if no two of its arguments are the same character.
    Case is ignored."
   (do* ((head character (car list))
 	(list more-characters (cdr list)))
@@ -403,7 +403,7 @@
 
 
 (defun char-lessp (character &rest more-characters)
-  _N"Returns T if its arguments are in strictly increasing alphabetic order.
+  "Returns T if its arguments are in strictly increasing alphabetic order.
    Case is ignored."
   (do* ((c character (car list))
 	(list more-characters (cdr list)))
@@ -414,7 +414,7 @@
 
 
 (defun char-greaterp (character &rest more-characters)
-  _N"Returns T if its arguments are in strictly decreasing alphabetic order.
+  "Returns T if its arguments are in strictly decreasing alphabetic order.
    Case is ignored."
   (do* ((c character (car list))
 	(list more-characters (cdr list)))
@@ -425,7 +425,7 @@
 
 
 (defun char-not-greaterp (character &rest more-characters)
-  _N"Returns T if its arguments are in strictly non-decreasing alphabetic order.
+  "Returns T if its arguments are in strictly non-decreasing alphabetic order.
    Case is ignored."
   (do* ((c character (car list))
 	(list more-characters (cdr list)))
@@ -436,7 +436,7 @@
 
 
 (defun char-not-lessp (character &rest more-characters)
-  _N"Returns T if its arguments are in strictly non-increasing alphabetic order.
+  "Returns T if its arguments are in strictly non-increasing alphabetic order.
    Case is ignored."
   (do* ((c character (car list))
 	(list more-characters (cdr list)))
@@ -451,7 +451,7 @@
 ;;;; Miscellaneous functions:
 
 (defun char-upcase (char)
-  _N"Returns CHAR converted to upper-case if that is possible."
+  "Returns CHAR converted to upper-case if that is possible."
   (declare (character char))
   #-(and unicode (not unicode-bootstrap))
   (if (lower-case-p char)
@@ -464,7 +464,7 @@
 	  (t char))))
 
 (defun char-titlecase (char)
-  _N"Returns CHAR converted to title-case if that is possible."
+  "Returns CHAR converted to title-case if that is possible."
   (declare (character char))
   #-(and unicode (not unicode-bootstrap))
   (if (lower-case-p char)
@@ -477,7 +477,7 @@
 	  (t char))))
 
 (defun char-downcase (char)
-  _N"Returns CHAR converted to lower-case if that is possible."
+  "Returns CHAR converted to lower-case if that is possible."
   (declare (character char))
   #-(and unicode (not unicode-bootstrap))
   (if (upper-case-p char)
@@ -490,7 +490,7 @@
 	  (t char))))
 
 (defun digit-char (weight &optional (radix 10))
-  _N"All arguments must be integers.  Returns a character object that
+  "All arguments must be integers.  Returns a character object that
   represents a digit of the given weight in the specified radix.  Returns
   NIL if no such character exists."
   (declare (type (integer 2 36) radix) (type unsigned-byte weight))
diff --git a/code/class.lisp b/code/class.lisp
index 62362b63817c029cf0f5c9412fda1dd829a2c700..6f5a4d0ef5e3790b700c76a9b1f3c85bbfe4319c 100644
--- a/code/class.lisp
+++ b/code/class.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/class.lisp,v 1.63 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/class.lisp,v 1.64 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -167,7 +167,7 @@
   (setf (%instance-ref layout (1+ i)) new-value))
 
 (defconstant layout-hash-max (ash most-positive-fixnum -3)
-  _N"The inclusive upper bound on LAYOUT-HASH values.")
+  "The inclusive upper bound on LAYOUT-HASH values.")
 
 (defvar *layout-hash-seed* nil)
 
@@ -390,7 +390,7 @@
 ;;; FIND-CLASS  --  Public
 ;;;
 (defun find-class (name &optional (errorp t) environment)
-  _N"Return the class with the specified Name.  If ERRORP is false, then NIL is
+  "Return the class with the specified Name.  If ERRORP is false, then NIL is
    returned when no such class exists."
   (declare (type symbol name) (ignore environment))
   (let ((res (class-cell-class (find-class-cell name))))
@@ -1020,7 +1020,7 @@
 ;;;
 (declaim (inline class-of))
 (defun class-of (object)
-  _N"Return the class of the supplied object, which may be any Lisp object, not
+  "Return the class of the supplied object, which may be any Lisp object, not
    just a CLOS STANDARD-OBJECT."
   (layout-class (layout-of object)))
 
diff --git a/code/clx-ext.lisp b/code/clx-ext.lisp
index 4866cda9327efbf351d4a048d392db0fab8c381b..d9ca22ff61515f2032d07ffaaed54e65fc2693f0 100644
--- a/code/clx-ext.lisp
+++ b/code/clx-ext.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/clx-ext.lisp,v 1.22 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/clx-ext.lisp,v 1.23 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -43,7 +43,7 @@
 ;;; New version to interface with "telent-clx".
 #+(and)
 (defun open-clx-display (&optional display-name)
-  _N"Open a connection to DISPLAY-NAME if supplied, or to the appropriate
+  "Open a connection to DISPLAY-NAME if supplied, or to the appropriate
 default display as given by GET-DEFAULT-DISPLAY otherwise."
   (destructuring-bind (host display screen protocol)
       (xlib::get-default-display display-name)
@@ -57,7 +57,7 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 (defun open-clx-display (&optional (string (cdr (assoc :display
 						       *environment-list*
 						       :test #'eq))))
-  _N"Parses the display specifier STRING, including display and screen numbers.
+  "Parses the display specifier STRING, including display and screen numbers.
    STRING defaults to the value of the  DISPLAY environment variable.  If STRING
    is non-nil, and any fields are missing in the specification, this signals an
    error.  If you specify a screen, then this sets XLIB:DISPLAY-DEFAULT-SCREEN
@@ -112,7 +112,7 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 
 (defun carefully-add-font-paths (display font-pathnames
 					 &optional (operation :append))
-  _N"Adds the list of font pathnames, Font-Pathnames, to the font path of
+  "Adds the list of font pathnames, Font-Pathnames, to the font path of
   the server Display but does so carefully by checking to make sure that
   the font pathnames are not already on the server's font path.  If any
   of the font pathnames are on the server's font path, they will remain
@@ -139,13 +139,13 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 ;;;; Enabling and disabling event handling through SYSTEM:SERVE-EVENT.
 
 (defvar *clx-fds-to-displays* (make-hash-table :test #'eql)
-  _N"This is a hash table that maps CLX file descriptors to CLX display
+  "This is a hash table that maps CLX file descriptors to CLX display
    structures.  For every CLX file descriptor know to SYSTEM:SERVE-EVENT,
    there must be a mapping from that file descriptor to its CLX display
    structure when events are handled via SYSTEM:SERVE-EVENT.")
 
 (defmacro with-clx-event-handling ((display handler) &rest body)
-  _N"Evaluates body in a context where events are handled for the display
+  "Evaluates body in a context where events are handled for the display
    by calling handler on the display.  This destroys any previously established
    handler for display."
   `(unwind-protect
@@ -162,7 +162,7 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 ;;; *clx-fds-to-displays*, so the user's handler can be called on the display.
 ;;;
 (defun enable-clx-event-handling (display handler)
-  _N"After calling this, when SYSTEM:SERVE-EVENT notices input on display's
+  "After calling this, when SYSTEM:SERVE-EVENT notices input on display's
    connection to the X11 server, handler is called on the display.  Handler
    is invoked in a dynamic context with an error handler bound that will
    flush all events from the display and return.  By returning, it declines
@@ -212,7 +212,7 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 	(funcall handler display)))))
 
 (defun disable-clx-event-handling (display)
-  _N"Undoes the effect of EXT:ENABLE-CLX-EVENT-HANDLING."
+  "Undoes the effect of EXT:ENABLE-CLX-EVENT-HANDLING."
   (setf *display-event-handlers*
 	(delete display *display-event-handlers* :key #'car))
   (let ((fd (fd-stream-fd (xlib::display-input-stream display))))
@@ -236,7 +236,7 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 (declaim (declaration values))
 
 (defun object-set-event-handler (display)
-  _N"This display event handler uses object sets to map event windows cross
+  "This display event handler uses object sets to map event windows cross
    event types to handlers.  It uses XLIB:EVENT-CASE to bind all the slots
    of each event, calling the handlers on all these values in addition to
    the event key and send-event-p.  Describe EXT:SERVE-MUMBLE, where mumble
@@ -380,7 +380,7 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 	 event-key object (lisp::map-xwindow event-window)))
 
 (defun flush-display-events (display)
-  _N"Dumps all the events in display's event queue including the current one
+  "Dumps all the events in display's event queue including the current one
    in case this is called from within XLIB:EVENT-CASE, etc."
   (xlib:discard-current-event display)
   (xlib:event-case (display :discard-p t :timeout 0)
@@ -391,28 +391,28 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 ;;;; Key and button service.
 
 (defun serve-key-press (object-set fun)
-  _N"Associate a method in the object-set with :key-press events.  The method
+  "Associate a method in the object-set with :key-press events.  The method
    is called on the object the event occurred, event key, event window, root,
    child, same-screen-p, x, y, root-x, root-y, state, time, code, and
    send-event-p."
   (setf (gethash :key-press (lisp::object-set-table object-set)) fun))
 
 (defun serve-key-release (object-set fun)
-  _N"Associate a method in the object-set with :key-release events.  The method
+  "Associate a method in the object-set with :key-release events.  The method
    is called on the object the event occurred, event key, event window, root,
    child, same-screen-p, x, y, root-x, root-y, state, time, code, and
    send-event-p."
   (setf (gethash :key-release (lisp::object-set-table object-set)) fun))
 
 (defun serve-button-press (object-set fun)
-  _N"Associate a method in the object-set with :button-press events.  The method
+  "Associate a method in the object-set with :button-press events.  The method
    is called on the object the event occurred, event key, event window, root,
    child, same-screen-p, x, y, root-x, root-y, state, time, code, and
    send-event-p."
   (setf (gethash :button-press (lisp::object-set-table object-set)) fun))
 
 (defun serve-button-release (object-set fun)
-  _N"Associate a method in the object-set with :button-release events.  The
+  "Associate a method in the object-set with :button-release events.  The
    method is called on the object the event occurred, event key, event window,
    root, child, same-screen-p, x, y, root-x, root-y, state, time, code, and
    send-event-p."
@@ -423,21 +423,21 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 ;;;; Mouse service.
 
 (defun serve-motion-notify (object-set fun)
-  _N"Associate a method in the object-set with :motion-notify events.  The method
+  "Associate a method in the object-set with :motion-notify events.  The method
    is called on the object the event occurred, event key, event window, root,
    child, same-screen-p, x, y, root-x, root-y, state, time, hint-p, and
    send-event-p."
   (setf (gethash :motion-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-enter-notify (object-set fun)
-  _N"Associate a method in the object-set with :enter-notify events.  The method
+  "Associate a method in the object-set with :enter-notify events.  The method
    is called on the object the event occurred, event key, event window, root,
    child, same-screen-p, x, y, root-x, root-y, state, time, mode, kind,
    and send-event-p."
   (setf (gethash :enter-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-leave-notify (object-set fun)
-  _N"Associate a method in the object-set with :leave-notify events.  The method
+  "Associate a method in the object-set with :leave-notify events.  The method
    is called on the object the event occurred, event key, event window, root,
    child, same-screen-p, x, y, root-x, root-y, state, time, mode, kind,
    and send-event-p."
@@ -448,13 +448,13 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 ;;;; Keyboard service.
 
 (defun serve-focus-in (object-set fun)
-  _N"Associate a method in the object-set with :focus-in events.  The method
+  "Associate a method in the object-set with :focus-in events.  The method
    is called on the object the event occurred, event key, event window, mode,
    kind, and send-event-p."
   (setf (gethash :focus-in (lisp::object-set-table object-set)) fun))
 
 (defun serve-focus-out (object-set fun) 
-  _N"Associate a method in the object-set with :focus-out events.  The method
+  "Associate a method in the object-set with :focus-out events.  The method
    is called on the object the event occurred, event key, event window, mode,
    kind, and send-event-p."
   (setf (gethash :focus-out (lisp::object-set-table object-set)) fun))
@@ -464,19 +464,19 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 ;;;; Exposure service.
 
 (defun serve-exposure (object-set fun)
-  _N"Associate a method in the object-set with :exposure events.  The method
+  "Associate a method in the object-set with :exposure events.  The method
    is called on the object the event occurred, event key, event window, x, y,
    width, height, count, and send-event-p."
   (setf (gethash :exposure (lisp::object-set-table object-set)) fun))
 
 (defun serve-graphics-exposure (object-set fun)
-  _N"Associate a method in the object-set with :graphics-exposure events.  The
+  "Associate a method in the object-set with :graphics-exposure events.  The
    method is called on the object the event occurred, event key, event window,
    x, y, width, height, count, major, minor, and send-event-p."
   (setf (gethash :graphics-exposure (lisp::object-set-table object-set)) fun))
 
 (defun serve-no-exposure (object-set fun)
-  _N"Associate a method in the object-set with :no-exposure events.  The method
+  "Associate a method in the object-set with :no-exposure events.  The method
    is called on the object the event occurred, event key, event window, major,
    minor, and send-event-p."
   (setf (gethash :no-exposure (lisp::object-set-table object-set)) fun))
@@ -486,82 +486,82 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 ;;;; Structure service.
 
 (defun serve-visibility-notify (object-set fun)
-  _N"Associate a method in the object-set with :visibility-notify events.  The
+  "Associate a method in the object-set with :visibility-notify events.  The
    method is called on the object the event occurred, event key, event window,
    state, and send-event-p."
   (setf (gethash :visibility-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-create-notify (object-set fun)
-  _N"Associate a method in the object-set with :create-notify events.  The
+  "Associate a method in the object-set with :create-notify events.  The
    method is called on the object the event occurred, event key, event window,
    window, x, y, width, height, border-width, override-redirect-p, and
    send-event-p."
   (setf (gethash :create-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-destroy-notify (object-set fun)
-  _N"Associate a method in the object-set with :destroy-notify events.  The
+  "Associate a method in the object-set with :destroy-notify events.  The
    method is called on the object the event occurred, event key, event window,
    window, and send-event-p."
   (setf (gethash :destroy-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-unmap-notify (object-set fun)
-  _N"Associate a method in the object-set with :unmap-notify events.  The
+  "Associate a method in the object-set with :unmap-notify events.  The
    method is called on the object the event occurred, event key, event window,
    window, configure-p, and send-event-p."
   (setf (gethash :unmap-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-map-notify (object-set fun)
-  _N"Associate a method in the object-set with :map-notify events.  The
+  "Associate a method in the object-set with :map-notify events.  The
    method is called on the object the event occurred, event key, event window,
    window, override-redirect-p, and send-event-p."
   (setf (gethash :map-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-map-request (object-set fun)
-  _N"Associate a method in the object-set with :map-request events.  The
+  "Associate a method in the object-set with :map-request events.  The
    method is called on the object the event occurred, event key, event window,
    window, and send-event-p."
   (setf (gethash :map-request (lisp::object-set-table object-set)) fun))
 
 (defun serve-reparent-notify (object-set fun)
-  _N"Associate a method in the object-set with :reparent-notify events.  The
+  "Associate a method in the object-set with :reparent-notify events.  The
    method is called on the object the event occurred, event key, event window,
    window, parent, x, y, override-redirect-p, and send-event-p."
   (setf (gethash :reparent-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-configure-notify (object-set fun)
-  _N"Associate a method in the object-set with :configure-notify events.  The
+  "Associate a method in the object-set with :configure-notify events.  The
    method is called on the object the event occurred, event key, event window,
    window, x, y, width, height, border-width, above-sibling,
    override-redirect-p, and send-event-p."
   (setf (gethash :configure-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-gravity-notify (object-set fun)
-  _N"Associate a method in the object-set with :gravity-notify events.  The
+  "Associate a method in the object-set with :gravity-notify events.  The
    method is called on the object the event occurred, event key, event window,
    window, x, y, and send-event-p."
   (setf (gethash :gravity-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-resize-request (object-set fun)
-  _N"Associate a method in the object-set with :resize-request events.  The
+  "Associate a method in the object-set with :resize-request events.  The
    method is called on the object the event occurred, event key, event window,
    width, height, and send-event-p."
   (setf (gethash :resize-request (lisp::object-set-table object-set)) fun))
 
 (defun serve-configure-request (object-set fun)
-  _N"Associate a method in the object-set with :configure-request events.  The
+  "Associate a method in the object-set with :configure-request events.  The
    method is called on the object the event occurred, event key, event window,
    window, x, y, width, height, border-width, stack-mode, above-sibling,
    value-mask, and send-event-p."
   (setf (gethash :configure-request (lisp::object-set-table object-set)) fun))
 
 (defun serve-circulate-notify (object-set fun)
-  _N"Associate a method in the object-set with :circulate-notify events.  The
+  "Associate a method in the object-set with :circulate-notify events.  The
    method is called on the object the event occurred, event key, event window,
    window, place, and send-event-p."
   (setf (gethash :circulate-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-circulate-request (object-set fun)
-  _N"Associate a method in the object-set with :circulate-request events.  The
+  "Associate a method in the object-set with :circulate-request events.  The
    method is called on the object the event occurred, event key, event window,
    window, place, and send-event-p."
   (setf (gethash :circulate-request (lisp::object-set-table object-set)) fun))
@@ -571,37 +571,37 @@ default display as given by GET-DEFAULT-DISPLAY otherwise."
 ;;;; Misc. service.
 
 (defun serve-property-notify (object-set fun)
-  _N"Associate a method in the object-set with :property-notify events.  The
+  "Associate a method in the object-set with :property-notify events.  The
    method is called on the object the event occurred, event key, event window,
    atom, state, time, and send-event-p."
   (setf (gethash :property-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-selection-clear (object-set fun)
-  _N"Associate a method in the object-set with :selection-clear events.  The
+  "Associate a method in the object-set with :selection-clear events.  The
    method is called on the object the event occurred, event key, event window,
    selection, time, and send-event-p."
   (setf (gethash :selection-clear (lisp::object-set-table object-set)) fun))
 
 (defun serve-selection-request (object-set fun)
-  _N"Associate a method in the object-set with :selection-request events.  The
+  "Associate a method in the object-set with :selection-request events.  The
    method is called on the object the event occurred, event key, event window,
    requestor, selection, target, property, time, and send-event-p."
   (setf (gethash :selection-request (lisp::object-set-table object-set)) fun))
 
 (defun serve-selection-notify (object-set fun)
-  _N"Associate a method in the object-set with :selection-notify events.  The
+  "Associate a method in the object-set with :selection-notify events.  The
    method is called on the object the event occurred, event key, event window,
    selection, target, property, time, and send-event-p."
   (setf (gethash :selection-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-colormap-notify (object-set fun)
-  _N"Associate a method in the object-set with :colormap-notify events.  The
+  "Associate a method in the object-set with :colormap-notify events.  The
    method is called on the object the event occurred, event key, event window,
    colormap, new-p, installed-p, and send-event-p."
   (setf (gethash :colormap-notify (lisp::object-set-table object-set)) fun))
 
 (defun serve-client-message (object-set fun)
-  _N"Associate a method in the object-set with :client-message events.  The
+  "Associate a method in the object-set with :client-message events.  The
    method is called on the object the event occurred, event key, event window,
    format, data, and send-event-p."
   (setf (gethash :client-message (lisp::object-set-table object-set)) fun))
diff --git a/code/commandline.lisp b/code/commandline.lisp
index 5162ead61245f81353fcf9fb95f5c53491159235..2ffd7fe3e5b30b82a80d5e54e7ab797456e8af44 100644
--- a/code/commandline.lisp
+++ b/code/commandline.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/commandline.lisp,v 1.18 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/commandline.lisp,v 1.19 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -25,26 +25,26 @@
 	  defswitch cmd-switch-arg get-command-line-switch))
 
 (defvar *command-line-application-arguments* ()
-  _N"A list of all the command line arguments after --")
+  "A list of all the command line arguments after --")
 
 (defvar *command-line-switches* ()
-  _N"A list of cmd-switch's representing the arguments used to invoke
+  "A list of cmd-switch's representing the arguments used to invoke
   this process.")
 
 (defvar *command-line-utility-name* ""
-  _N"The string name that was used to invoke this process.")
+  "The string name that was used to invoke this process.")
 
 (defvar *command-line-words* ()
-  _N"A list of words between the utility name and the first switch.")
+  "A list of words between the utility name and the first switch.")
 
 (defvar *command-line-strings* ()
-  _N"A list of strings obtained from the command line that invoked this process.")
+  "A list of strings obtained from the command line that invoked this process.")
 
 (defvar *command-switch-demons* ()
-  _N"An Alist of (\"argument-name\" . demon-function)")
+  "An Alist of (\"argument-name\" . demon-function)")
 
 (defvar *batch-mode* nil
-  _N"When True runs lisp with its input coming from standard-input.
+  "When True runs lisp with its input coming from standard-input.
    If an error is detected returns error code 1, otherwise 0.")
 
 (defstruct (command-line-switch (:conc-name cmd-switch-)
@@ -128,7 +128,7 @@
 	    (setq str (pop cmd-strings))))))))
 
 (defun get-command-line-switch (sname)
-  _N"Accepts the name of a switch as a string and returns the value of the
+  "Accepts the name of a switch as a string and returns the value of the
    switch.  If no value was specified, then any following words are returned.
    If there are no following words, then t is returned.  If the switch was not
    specified, then nil is returned."
@@ -146,7 +146,7 @@
 ;;;; Defining Switches and invoking demons.
 
 (defvar *complain-about-illegal-switches* t
-  _N"When set, invoking switch demons complains about illegal switches that have
+  "When set, invoking switch demons complains about illegal switches that have
    not been defined with DEFSWITCH.")
 
 ;;; This is a list of legal switch names.  DEFSWITCH sets this, and
@@ -171,7 +171,7 @@
       (lisp::finish-standard-output-streams))))
 
 (defmacro defswitch (name &optional function)
-  _N"Associates function with the switch name in *command-switch-demons*.  Name
+  "Associates function with the switch name in *command-switch-demons*.  Name
    is a simple-string that does not begin with a hyphen, unless the switch name
    really does begin with one.  Function is optional, but defining the switch
    is necessary to keep invoking switch demons from complaining about illegal
diff --git a/code/debug-int.lisp b/code/debug-int.lisp
index 24658e900b91e07b266f5f597a9738fce69134f4..d534229d57348dfbeb47751f40c1db30761bea17 100644
--- a/code/debug-int.lisp
+++ b/code/debug-int.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.138 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.139 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -776,7 +776,7 @@
 (declaim (inline debug-source-root-number))
 ;;;
 (defun debug-source-root-number (debug-source)
-  _N"Returns the number of top-level forms processed by the compiler before
+  "Returns the number of top-level forms processed by the compiler before
    compiling this source.  If this source is uncompiled, this is zero.  This
    may be zero even if the source is compiled since the first form in the first
    file compiled in one compilation, for example, must have a root number of
@@ -994,7 +994,7 @@
 ;;; TOP-FRAME -- Public.
 ;;;
 (defun top-frame ()
-  _N"Returns the top frame of the control stack as it was before calling this
+  "Returns the top frame of the control stack as it was before calling this
    function."
   (multiple-value-bind (fp pc)
       (kernel:%caller-frame-and-pc)
@@ -1007,7 +1007,7 @@
 ;;; FLUSH-FRAMES-ABOVE -- public.
 ;;; 
 (defun flush-frames-above (frame)
-  _N"Flush all of the frames above FRAME, and renumber all the frames below
+  "Flush all of the frames above FRAME, and renumber all the frames below
    FRAME."
   (setf (frame-up frame) nil)
   (do ((number 0 (1+ number))
@@ -1021,7 +1021,7 @@
 ;;; COMPUTE-CALLING-FRAME.
 ;;;
 (defun frame-down (frame)
-  _N"Returns the frame immediately below frame on the stack.  When frame is
+  "Returns the frame immediately below frame on the stack.  When frame is
    the bottom of the stack, this returns nil."
   (let ((down (frame-%down frame)))
     (if (eq down :unparsed)
@@ -1133,7 +1133,7 @@
 
 
 (defvar *debugging-interpreter* nil
-  _N"When set, the debugger foregoes making interpreted-frames, so you can
+  "When set, the debugger foregoes making interpreted-frames, so you can
    debug the functions that manifest the interpreter.")
 
 ;;; POSSIBLY-AN-INTERPRETED-FRAME -- Internal.
@@ -1182,7 +1182,7 @@
 
 #+(or sparc (and x86 darwin) (and (or x86 amd64) linux))
 (defun find-foreign-function-name (address)
-  _N"Return a string describing the foreign function near ADDRESS"
+  "Return a string describing the foreign function near ADDRESS"
   (let ((addr (sys:sap-int address)))
     (alien:with-alien ((info (alien:struct dl-info
 					   (filename c-call:c-string)
@@ -1206,10 +1206,10 @@
 #-(or sparc (and x86 darwin) (and (or x86 amd64) linux))
 (defun find-foreign-function-name (ra)
   (declare (ignore ra))
-  _N"Foreign function call land")
+  "Foreign function call land")
 
 (defun assembly-routines-p (component)
-  _N"Return t if COMPONENT contains code from assembly routines."
+  "Return t if COMPONENT contains code from assembly routines."
   (let ((start (sap-int (kernel:code-instructions component))))
     (maphash (lambda (_ addr)
 	       (declare (ignore _))
@@ -1218,7 +1218,7 @@
 	     lisp::*assembler-routines*)))
 
 (defun find-assembly-routine-name (component pc)
-  _N"Return the name of the assembly routine at offset PC in COMPONENT.
+  "Return the name of the assembly routine at offset PC in COMPONENT.
 The result is a symbol or nil if the routine cannot be found."
   (let* ((start (sap-int (kernel:code-instructions component)))
 	 (end (+ start (* (kernel::%code-code-size component) 
@@ -1453,7 +1453,7 @@ The result is a symbol or nil if the routine cannot be found."
 
 #-(or gengc x86 amd64)
 (defun find-pc-from-assembly-fun (code scp)
-  _N"find the PC"
+  "find the PC"
   (let ((return-machine-address
 	 #-ppc
 	  (- (vm:sigcontext-register scp vm::lra-offset)
@@ -1759,7 +1759,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; FRAME-CATCHES -- Public.
 ;;;
 (defun frame-catches (frame)
-  _N"Returns an a-list mapping catch tags to code-locations.  These are
+  "Returns an a-list mapping catch tags to code-locations.  These are
    code-locations at which execution would continue with frame as the top
    frame if someone threw to the corresponding tag."
   (let ((catch
@@ -1842,7 +1842,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;;
 (defmacro do-debug-function-blocks ((block-var debug-function &optional result)
 				    &body body)
-  _N"Executes the forms in a context with block-var bound to each debug-block in
+  "Executes the forms in a context with block-var bound to each debug-block in
    debug-function successively.  Result is an optional form to execute for
    return values, and DO-DEBUG-FUNCTION-BLOCKS returns nil if there is no
    result form.  This signals a no-debug-blocks condition when the
@@ -1859,7 +1859,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;;
 (defmacro do-debug-function-variables ((var debug-function &optional result)
 				       &body body)
-  _N"Executes body in a context with var bound to each debug-variable in
+  "Executes body in a context with var bound to each debug-variable in
    debug-function.  This returns the value of executing result (defaults to
    nil).  This may iterate over only some of debug-function's variables or none
    depending on debug policy; for example, possibly the compilation only
@@ -1877,7 +1877,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-FUNCTION-FUNCTION -- Public.
 ;;;
 (defun debug-function-function (debug-function)
-  _N"Returns the Common Lisp function associated with the debug-function.  This
+  "Returns the Common Lisp function associated with the debug-function.  This
    returns nil if the function is unavailable or is non-existent as a user
    callable function object."
   (let ((cached-value (debug-function-%function debug-function)))
@@ -1910,7 +1910,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-FUNCTION-NAME -- Public.
 ;;;
 (defun debug-function-name (debug-function)
-  _N"Returns the name of the function represented by debug-function.  This may
+  "Returns the name of the function represented by debug-function.  This may
    be a string or a cons; do not assume it is a symbol."
   (etypecase debug-function
     (compiled-debug-function
@@ -1927,7 +1927,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; If LOCAL-NAME is given, try to return the debug function for the
 ;;; local function (labels or flet).
 (defun function-debug-function (fun &key local-name)
-  _N"Returns a debug-function that represents debug information for function."
+  "Returns a debug-function that represents debug information for function."
   (case (get-type fun)
     (#.vm:closure-header-type
      (function-debug-function (%closure-function fun)))
@@ -1967,7 +1967,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-FUNCTION-KIND -- Public.
 ;;;
 (defun debug-function-kind (debug-function)
-  _N"Returns the kind of the function which is one of :optional, :external,
+  "Returns the kind of the function which is one of :optional, :external,
    :top-level, :cleanup, nil."
   (etypecase debug-function
     (compiled-debug-function
@@ -1981,13 +1981,13 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-VARIABLE-INFO-AVAILABLE -- Public.
 ;;;
 (defun debug-variable-info-available (debug-function)
-  _N"Returns whether there is any variable information for debug-function."
+  "Returns whether there is any variable information for debug-function."
   (not (not (debug-function-debug-variables debug-function))))
 
 ;;; DEBUG-FUNCTION-SYMBOL-VARIABLES -- Public.
 ;;;
 (defun debug-function-symbol-variables (debug-function symbol)
-  _N"Returns a list of debug-variables in debug-function having the same name
+  "Returns a list of debug-variables in debug-function having the same name
    and package as symbol.  If symbol is uninterned, then this returns a list of
    debug-variables without package names and with the same name as symbol.  The
    result of this function is limited to the availability of variable
@@ -2008,7 +2008,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; AMBIGUOUS-DEBUG-VARIABLES -- Public.
 ;;;
 (defun ambiguous-debug-variables (debug-function name-prefix-string)
-   _N"Returns a list of debug-variables in debug-function whose names contain
+   "Returns a list of debug-variables in debug-function whose names contain
     name-prefix-string as an intial substring.  The result of this function is
     limited to the availability of variable information in debug-function; for
     example, possibly debug-function only knows about its arguments."
@@ -2058,7 +2058,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-FUNCTION-LAMBDA-LIST -- Public.
 ;;;
 (defun debug-function-lambda-list (debug-function)
-  _N"Returns a list representing the lambda-list for debug-function.  The list
+  "Returns a list representing the lambda-list for debug-function.  The list
    has the following structure:
       (required-var1 required-var2
        ...
@@ -2692,7 +2692,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; :unsure part to get the HANDLER-CASE into another function.
 ;;;
 (defun code-location-unknown-p (basic-code-location)
-  _N"Returns whether basic-code-location is unknown.  It returns nil when the
+  "Returns whether basic-code-location is unknown.  It returns nil when the
    code-location is known."
   (ecase (code-location-%unknown-p basic-code-location)
     ((t) t)
@@ -2705,7 +2705,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; CODE-LOCATION-DEBUG-BLOCK -- Public.
 ;;;
 (defun code-location-debug-block (basic-code-location)
-  _N"Returns the debug-block containing code-location if it is available.  Some
+  "Returns the debug-block containing code-location if it is available.  Some
    debug policies inhibit debug-block information, and if none is available,
    then this signals a no-debug-blocks condition."
   (let ((block (code-location-%debug-block basic-code-location)))
@@ -2773,7 +2773,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; CODE-LOCATION-DEBUG-SOURCE -- Public.
 ;;;
 (defun code-location-debug-source (code-location)
-  _N"Returns the code-location's debug-source."
+  "Returns the code-location's debug-source."
   (etypecase code-location
     (compiled-code-location
      (let* ((info (compiled-debug-function-debug-info
@@ -2805,7 +2805,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; CODE-LOCATION-TOP-LEVEL-FORM-OFFSET -- Public.
 ;;;
 (defun code-location-top-level-form-offset (code-location)
-  _N"Returns the number of top-level forms before the one containing
+  "Returns the number of top-level forms before the one containing
    code-location as seen by the compiler in some compilation unit.  A
    compilation unit is not necessarily a single file, see the section on
    debug-sources."
@@ -2830,7 +2830,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; CODE-LOCATION-FORM-NUMBER -- Public.
 ;;;
 (defun code-location-form-number (code-location)
-  _N"Returns the number of the form corresponding to code-location.  The form
+  "Returns the number of the form corresponding to code-location.  The form
    number is derived by a walking the subforms of a top-level form in
    depth-first order."
   (when (code-location-unknown-p code-location)
@@ -2854,7 +2854,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; CODE-LOCATION-KIND -- Public
 ;;; 
 (defun code-location-kind (code-location)
-  _N"Return the kind of CODE-LOCATION, one of:
+  "Return the kind of CODE-LOCATION, one of:
      :interpreted, :unknown-return, :known-return, :internal-error,
      :non-local-exit, :block-start, :call-site, :single-value-return,
      :non-local-entry"
@@ -2894,7 +2894,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; CODE-LOCATION= -- Public.
 ;;;
 (defun code-location= (obj1 obj2)
-  _N"Returns whether obj1 and obj2 are the same place in the code."
+  "Returns whether obj1 and obj2 are the same place in the code."
   (etypecase obj1
     (compiled-code-location
      (etypecase obj2
@@ -2955,7 +2955,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;;
 (defmacro do-debug-block-locations ((code-var debug-block &optional return)
 				    &body body)
-  _N"Executes forms in a context with code-var bound to each code-location in
+  "Executes forms in a context with code-var bound to each code-location in
    debug-block.  This returns the value of executing result (defaults to nil)."
   (let ((code-locations (gensym))
 	(i (gensym)))
@@ -2968,7 +2968,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-BLOCK-FUNCTION-NAME -- Internal.
 ;;;
 (defun debug-block-function-name (debug-block)
-  _N"Returns the name of the function represented by debug-function.  This may
+  "Returns the name of the function represented by debug-function.  This may
    be a string or a cons; do not assume it is a symbol."
   (etypecase debug-block
     (compiled-debug-block
@@ -3016,7 +3016,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-VARIABLE-SYMBOL -- Public.
 ;;;
 (defun debug-variable-symbol (debug-var)
-  _N"Returns the symbol from interning DEBUG-VARIABLE-NAME in the package named
+  "Returns the symbol from interning DEBUG-VARIABLE-NAME in the package named
    by DEBUG-VARIABLE-PACKAGE."
   (let ((package (debug-variable-package debug-var)))
     (if package
@@ -3026,7 +3026,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-VARIABLE-VALID-VALUE -- Public.
 ;;;
 (defun debug-variable-valid-value (debug-var frame)
-  _N"Returns the value stored for debug-variable in frame.  If the value is not
+  "Returns the value stored for debug-variable in frame.  If the value is not
    :valid, then this signals an invalid-value error."
   (unless (eq (debug-variable-validity debug-var (frame-code-location frame))
 	      :valid)
@@ -3036,7 +3036,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-VARIABLE-VALUE -- Public.
 ;;;
 (defun debug-variable-value (debug-var frame)
-  _N"Returns the value stored for debug-variable in frame.  The value may be
+  "Returns the value stored for debug-variable in frame.  The value may be
    invalid.  This is SETF'able."
   (etypecase debug-var
     (compiled-debug-variable
@@ -3763,7 +3763,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; in the code-location.
 ;;;
 (defun debug-variable-validity (debug-var basic-code-loc)
-  _N"Returns three values reflecting the validity of debug-variable's value
+  "Returns three values reflecting the validity of debug-variable's value
    at basic-code-location:
       :valid    The value is known to be available.
       :invalid  The value is known to be unavailable.
@@ -3850,7 +3850,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; is the top-level-form number.
 ;;;
 (defun form-number-translations (form tlf-number)
-  _N"This returns a table mapping form numbers to source-paths.  A source-path
+  "This returns a table mapping form numbers to source-paths.  A source-path
    indicates a descent into the top-level-form form, going directly to the
    subform corressponding to the form number."
   (clrhash *form-number-circularity-table*)
@@ -3885,7 +3885,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; SOURCE-PATH-CONTEXT  --  Public.
 ;;;
 (defun source-path-context (form path context)
-  _N"Form is a top-level form, and path is a source-path into it.  This returns
+  "Form is a top-level form, and path is a source-path into it.  This returns
    the form indicated by the source-path.  Context is the number of enclosing
    forms to return instead of directly returning the source-path form.  When
    context is non-zero, the form returned contains a marker, #:****HERE****,
@@ -3929,7 +3929,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; accesses that variable from the frame argument.
 ;;;
 (defun preprocess-for-eval (form loc)
-  _N"Return a function of one argument that evaluates form in the lexical
+  "Return a function of one argument that evaluates form in the lexical
    context of the basic-code-location loc.  PREPROCESS-FOR-EVAL signals a
    no-debug-variables condition when the loc's debug-function has no
    debug-variable information available.  The returned function takes the frame
@@ -3992,7 +3992,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;;
 (defun eval-in-frame (frame form)
   (declare (type frame frame))
-  _N"Evaluate Form in the lexical context of Frame's current code location,
+  "Evaluate Form in the lexical context of Frame's current code location,
    returning the results of the evaluation."
   (funcall (preprocess-for-eval form (frame-code-location frame)) frame))
 
@@ -4001,7 +4001,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;;
 ;;; helper function, used also by debug:debug-return.
 (defun find-debug-tag-for-frame (frame)
-  _N"Find and return the debug catch tag for a given frame, if it exists."
+  "Find and return the debug catch tag for a given frame, if it exists."
   (assoc-if #'(lambda (x)
 		(and (symbolp x)
 		     (not (symbol-package x))
@@ -4013,7 +4013,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;;
 (defun return-from-frame (frame form)
   (declare (type frame frame))
-  _N"Evaluate Form in the lexical context of Frame's current code location,
+  "Evaluate Form in the lexical context of Frame's current code location,
    returning from the current frame the results of the evaluation."
   (let ((tag (find-debug-tag-for-frame frame)))
     (when tag (throw (car tag) (eval-in-frame frame form)))))
@@ -4028,7 +4028,7 @@ The result is a symbol or nil if the routine cannot be found."
 
 (defun make-breakpoint (hook-function what
 			&key (kind :code-location) info function-end-cookie)
-  _N"This creates and returns a breakpoint.  When program execution encounters
+  "This creates and returns a breakpoint.  When program execution encounters
    the breakpoint, the system calls hook-function.  Hook-function takes the
    current frame for the function in which the program is running and the
    breakpoint object.
@@ -4175,7 +4175,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; FUNCTION-END-COOKIE-VALID-P -- Public.
 ;;;
 (defun function-end-cookie-valid-p (frame cookie)
-  _N"This takes a function-end-cookie and a frame, and it returns whether the
+  "This takes a function-end-cookie and a frame, and it returns whether the
    cookie is still valid.  A cookie becomes invalid when the frame that
    established the cookie has exited.  Sometimes cookie holders are unaware
    of cookie invalidation because their :function-end breakpoint hooks didn't
@@ -4204,7 +4204,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; ACTIVATE-BREAKPOINT -- Public.
 ;;;
 (defun activate-breakpoint (breakpoint)
-  _N"This causes the system to invoke the breakpoint's hook-function until the
+  "This causes the system to invoke the breakpoint's hook-function until the
    next call to DEACTIVATE-BREAKPOINT or DELETE-BREAKPOINT.  The system invokes
    breakpoint hook functions in the opposite order that you activate them."
   (when (eq (breakpoint-status breakpoint) :deleted)
@@ -4295,7 +4295,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEACTIVATE-BREAKPOINT -- Public.
 ;;;
 (defun deactivate-breakpoint (breakpoint)
-  _N"This stops the system from invoking the breakpoint's hook-function."
+  "This stops the system from invoking the breakpoint's hook-function."
   (when (eq (breakpoint-status breakpoint) :active)
     (system:without-interrupts
      (let ((loc (breakpoint-what breakpoint)))
@@ -4339,7 +4339,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; BREAKPOINT-INFO -- Public.
 ;;;
 (defun breakpoint-info (breakpoint)
-  _N"This returns the user maintained info associated with breakpoint.  This
+  "This returns the user maintained info associated with breakpoint.  This
    is SETF'able."
   (breakpoint-%info breakpoint))
 ;;;
@@ -4358,7 +4358,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; BREAKPOINT-ACTIVE-P -- Public.
 ;;;
 (defun breakpoint-active-p (breakpoint)
-  _N"This returns whether breakpoint is currently active."
+  "This returns whether breakpoint is currently active."
   (ecase (breakpoint-status breakpoint)
     (:active t)
     ((:inactive :deleted) nil)))
@@ -4366,7 +4366,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DELETE-BREAKPOINT -- Public.
 ;;;
 (defun delete-breakpoint (breakpoint)
-  _N"This frees system storage and removes computational overhead associated with
+  "This frees system storage and removes computational overhead associated with
    breakpoint.  After calling this, breakpoint is completely impotent and can
    never become active again."
   (let ((status (breakpoint-status breakpoint)))
@@ -4627,7 +4627,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; MAKE-BOGUS-LRA -- Interface.
 ;;;
 (defun make-bogus-lra (real-lra &optional known-return-p)
-  _N"Make a bogus LRA object that signals a breakpoint trap when returned to.  If
+  "Make a bogus LRA object that signals a breakpoint trap when returned to.  If
    the breakpoint trap handler returns, REAL-LRA is returned to.  Three values
    are returned: the bogus LRA object, the code component it is part of, and
    the PC offset for the trap instruction."
@@ -4693,7 +4693,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; SET-BREAKPOINT-FOR-EDITOR -- Internal Interface.
 ;;;
 (defun set-breakpoint-for-editor (package name-str path)
-  _N"The editor calls this remotely in the slave to set breakpoints.  Package is
+  "The editor calls this remotely in the slave to set breakpoints.  Package is
    the string name of a package or nil, and name-str is a string representing a
    function name (for example, \"foo\" or \"(setf foo)\").  After finding
    package, this READs name-str with *package* bound appropriately.  Path is
@@ -4951,7 +4951,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; SET-LOCATION-BREAKPOINT-FOR-EDITOR -- Internal Interface.
 ;;;
 (defun set-location-breakpoint-for-editor (remote-obj-loc)
-  _N"The editor calls this in the slave with a remote-object representing a
+  "The editor calls this in the slave with a remote-object representing a
    code-location to set a breakpoint."
   (let ((loc (wire:remote-object-value remote-obj-loc)))
     (etypecase loc
@@ -4974,7 +4974,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DELETE-BREAKPOINT-FOR-EDITOR -- Internal Interface.
 ;;;
 (defun delete-breakpoint-for-editor (remote-obj-bpt)
-  _N"The editor calls this remotely in the slave to delete a breakpoint."
+  "The editor calls this remotely in the slave to delete a breakpoint."
   (delete-breakpoint (wire:remote-object-value remote-obj-bpt))
   (wire:forget-remote-translation remote-obj-bpt))
 
@@ -4990,7 +4990,7 @@ The result is a symbol or nil if the routine cannot be found."
 ;;; DEBUG-FUNCTION-START-LOCATION -- Public.
 ;;;
 (defun debug-function-start-location (debug-fun)
-  _N"This returns a code-location before the body of a function and after all
+  "This returns a code-location before the body of a function and after all
    the arguments are in place.  If this cannot determine that location due to
    a lack of debug information, it returns nil."
   (etypecase debug-fun
diff --git a/code/debug-vm.lisp b/code/debug-vm.lisp
index 1e50266058f2af68847e3296e6c940b5da916dd5..f539229109f37fa3f6f5381ffd4c3b7fed73cfaa 100644
--- a/code/debug-vm.lisp
+++ b/code/debug-vm.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-vm.lisp,v 1.3 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-vm.lisp,v 1.4 2010/04/19 02:18:03 rtoy Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -28,7 +28,7 @@
 ;;; MAKE-BOGUS-LRA -- Interface.
 ;;;
 (defun make-bogus-lra (real-lra &optional known-return-p)
-  _N"Make a bogus LRA object that signals a breakpoint trap when returned to.  If
+  "Make a bogus LRA object that signals a breakpoint trap when returned to.  If
    the breakpoint trap handler returns to the fake component, the fake code
    template returns to real-lra.  This returns three values: the bogus LRA
    object, the code component it points to, and the pc-offset for the trap
diff --git a/code/debug.lisp b/code/debug.lisp
index 57942ad6abeffde4b4d9b47e1c24e56594620ffd..febecaf1c5188b88d785ff8f6b74261fb56b245f 100644
--- a/code/debug.lisp
+++ b/code/debug.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug.lisp,v 1.70 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug.lisp,v 1.71 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -44,24 +44,24 @@
 ;;;; Variables, parameters, and constants.
 
 (defparameter *debug-print-level* 3
-  _N"*PRINT-LEVEL* is bound to this value when debug prints a function call.  If
+  "*PRINT-LEVEL* is bound to this value when debug prints a function call.  If
   null, use *PRINT-LEVEL*")
 
 (defparameter *debug-print-length* 5
-  _N"*PRINT-LENGTH* is bound to this value when debug prints a function call.  If
+  "*PRINT-LENGTH* is bound to this value when debug prints a function call.  If
   null, use *PRINT-LENGTH*.")
 
 (defparameter *default-print-frame-call-verbosity* 1
-  _N"default value for the verbose argument to print-frame-call.  If set to >= 2, source will be printed for all frames")
+  "default value for the verbose argument to print-frame-call.  If set to >= 2, source will be printed for all frames")
 
 (defvar *in-the-debugger* nil
-  _N"This is T while in the debugger.")
+  "This is T while in the debugger.")
 
 (defvar *debug-command-level* 0
-  _N"Pushes and pops/exits inside the debugger change this.")
+  "Pushes and pops/exits inside the debugger change this.")
 
 (defvar *stack-top-hint* nil
-  _N"If this is bound before the debugger is invoked, it is used as the stack
+  "If this is bound before the debugger is invoked, it is used as the stack
    top by the debugger.")
 (defvar *stack-top* nil)
 (defvar *real-stack-top* nil)
@@ -81,11 +81,11 @@
     (force-output)))
 
 (defparameter *debug-prompt* #'debug-prompt
-  _N"This is a function of no arguments that prints the debugger prompt
+  "This is a function of no arguments that prints the debugger prompt
    on *debug-io*.")
 
 (defconstant debug-help-string
-_N"
+"
 The prompt is right square brackets, the number indicating how many
   recursive command loops you are in.
 Debug commands do not affect * and friends, but evaluation in the debug loop
@@ -147,11 +147,11 @@ See the CMU Common Lisp User's Manual for more information.
 ;;;; Breakpoint state:
 
 (defvar *only-block-start-locations* nil
-  _N"When true, the LIST-LOCATIONS command only displays block start locations.
+  "When true, the LIST-LOCATIONS command only displays block start locations.
    Otherwise, all locations are displayed.")
 
 (defvar *print-location-kind* nil
-  _N"If true, list the code location type in the LIST-LOCATIONS command.")
+  "If true, list the code location type in the LIST-LOCATIONS command.")
 
 ;;; A list of the types of code-locations that should not be stepped to and
 ;;; should not be listed when listing breakpoints.
@@ -507,7 +507,7 @@ See the CMU Common Lisp User's Manual for more information.
 ;;; STEP -- Public.
 ;;;
 (defmacro step (form)
-  _N"STEP implements a debugging paradigm wherein the programmer is allowed
+  "STEP implements a debugging paradigm wherein the programmer is allowed
    to step through the evaluation of a form.  We use the debugger's stepping
    facility to step through an anonymous function containing only form.
 
@@ -524,7 +524,7 @@ See the CMU Common Lisp User's Manual for more information.
 ;;;
 (defun backtrace (&optional (count most-positive-fixnum)
 			    (*standard-output* *debug-io*))
-  _N"Show a listing of the call stack going down from the current frame.  In the
+  "Show a listing of the call stack going down from the current frame.  In the
    debugger, the current frame is indicated by the prompt.  Count is how many
    frames to show."
   (let ((*print-length* (or *debug-print-length* *print-length*))
@@ -691,7 +691,7 @@ See the CMU Common Lisp User's Manual for more information.
 ;;;; Invoke-debugger.
 
 (defvar *debugger-hook* nil
-  _N"This is either nil or a function of two arguments, a condition and the value
+  "This is either nil or a function of two arguments, a condition and the value
    of *debugger-hook*.  This function can either handle the condition or return
    which causes the standard debugger to execute.  The system passes the value
    of this variable to the function because it binds *debugger-hook* to nil
@@ -729,7 +729,7 @@ See the CMU Common Lisp User's Manual for more information.
 ;;; INVOKE-DEBUGGER -- Public.
 ;;;
 (defun invoke-debugger (condition)
-  _N"The CMU Common Lisp debugger.  Type h for help."
+  "The CMU Common Lisp debugger.  Type h for help."
   (when *debugger-hook*
     (let ((hook *debugger-hook*)
 	  (*debugger-hook* nil))
@@ -800,15 +800,15 @@ See the CMU Common Lisp User's Manual for more information.
 ;;;; Debug-loop.
 
 (defvar *flush-debug-errors* t
-  _N"When set, avoid calling INVOKE-DEBUGGER recursively when errors occur while
+  "When set, avoid calling INVOKE-DEBUGGER recursively when errors occur while
    executing in the debugger.  The 'flush' command toggles this.")
 
 (defvar *debug-readtable* nil
-  _N"When non-NIL, becomes the system *READTABLE* in the debugger
+  "When non-NIL, becomes the system *READTABLE* in the debugger
    read-eval-print loop")
 
 (defvar *debug-print-current-frame* t
-  _N"When non-NIL, print the current frame when entering the debugger.")
+  "When non-NIL, print the current frame when entering the debugger.")
 
 (defun maybe-handle-dead-input-stream (condition)
   ;; Scenario: "xon <remote-box> cmucl -edit"
@@ -888,7 +888,7 @@ See the CMU Common Lisp User's Manual for more information.
 				  (funcall cmd-fun)))))))))))))))
 
 (defvar *auto-eval-in-frame* t
-  _N"When set (the default), evaluations in the debugger's command loop occur
+  "When set (the default), evaluations in the debugger's command loop occur
    relative to the current frame's environment without the need of debugger
    forms that explicitly control this kind of evaluation.")
 
@@ -1005,7 +1005,7 @@ See the CMU Common Lisp User's Manual for more information.
 ;;; VAR -- Public.
 ;;;
 (defun var (name &optional (id 0 id-supplied))
-  _N"Returns a variable's value if possible.  Name is a simple-string or symbol.
+  "Returns a variable's value if possible.  Name is a simple-string or symbol.
    If it is a simple-string, it is an initial substring of the variable's name.
    If name is a symbol, it has the same name and package as the variable whose
    value this function returns.  If the symbol is uninterned, then the variable
@@ -1030,7 +1030,7 @@ See the CMU Common Lisp User's Manual for more information.
 ;;; ARG -- Public.
 ;;;
 (defun arg (n)
-  _N"Returns the n'th argument's value if possible.  Argument zero is the first
+  "Returns the n'th argument's value if possible.  Argument zero is the first
    argument in a frame's default printed representation.  Count keyword/value
    pairs as separate arguments."
   (multiple-value-bind
@@ -1312,7 +1312,7 @@ See the CMU Common Lisp User's Manual for more information.
 ;;;
  
 (defvar *help-line-scroll-count* 20
-  _N"This controls how many lines the debugger's help command prints before
+  "This controls how many lines the debugger's help command prints before
    printing a prompting line to continue with output.")
 
 (def-debug-command "HELP" ()
diff --git a/code/defmacro.lisp b/code/defmacro.lisp
index 1df70fe1853601786a8f1057ed6296ab7052912f..966f5fb4c10626961194a4ceb5d11bd375348234 100644
--- a/code/defmacro.lisp
+++ b/code/defmacro.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defmacro.lisp,v 1.38 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defmacro.lisp,v 1.39 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -22,16 +22,16 @@
 ;;; in DEFMACRO are the reason this isn't as easy as it sounds.
 ;;;
 (defvar *arg-tests* ()
-  _N"A list of tests that do argument counting at expansion time.")
+  "A list of tests that do argument counting at expansion time.")
 
 (defvar *system-lets* ()
-  _N"Let bindings that are done to make lambda-list parsing possible.")
+  "Let bindings that are done to make lambda-list parsing possible.")
 
 (defvar *user-lets* ()
-  _N"Let bindings that the user has explicitly supplied.")
+  "Let bindings that the user has explicitly supplied.")
 
 (defvar *default-default* nil
-  _N"Unsupplied optional and keyword arguments get this value defaultly.")
+  "Unsupplied optional and keyword arguments get this value defaultly.")
 
 ;; Temps that we introduce and might not reference.
 (defvar *ignorable-vars*)
@@ -50,7 +50,7 @@
 				   ((:environment env-arg-name))
 				   ((:default-default *default-default*))
 				   (error-fun 'error))
-  _N"Returns as multiple-values a parsed body, any local-declarations that
+  "Returns as multiple-values a parsed body, any local-declarations that
    should be made where this body is inserted, and a doc-string if there is
    one."
   (multiple-value-bind (body declarations documentation)
@@ -409,7 +409,7 @@
 	                       value-var))))
 
 (defun make-keyword (symbol)
-  _N"Takes a non-keyword symbol, symbol, and returns the corresponding keyword."
+  "Takes a non-keyword symbol, symbol, and returns the corresponding keyword."
   (intern (symbol-name symbol) *keyword-package*))
 
 (defun defmacro-error (problem kind name)
diff --git a/code/defstruct.lisp b/code/defstruct.lisp
index 1ae46f41ceeac635b8915cb5d20443efb02d55cd..209bc817c96faa676881d8b59e591858b075e3ef 100644
--- a/code/defstruct.lisp
+++ b/code/defstruct.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defstruct.lisp,v 1.99 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defstruct.lisp,v 1.100 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -38,27 +38,27 @@
 
 
 (defparameter *ANSI-defstruct-options-p* nil
-  _N"Controls compiling DEFSTRUCT :print-function and :print-method
+  "Controls compiling DEFSTRUCT :print-function and :print-method
    options according to ANSI spec. MUST be NIL to compile CMUCL & PCL")
 
 ;;;; Structure frobbing primitives.
 
 (defun %make-instance (length)
-  _N"Allocate a new instance with LENGTH data slots."
+  "Allocate a new instance with LENGTH data slots."
   (declare (type index length))
   (%make-instance length))
 
 (defun %instance-length (instance)
-  _N"Given an instance, return its length."
+  "Given an instance, return its length."
   (declare (type instance instance))
   (%instance-length instance))
 
 (defun %instance-ref (instance index)
-  _N"Return the value from the INDEXth slot of INSTANCE.  This is SETFable."
+  "Return the value from the INDEXth slot of INSTANCE.  This is SETFable."
   (%instance-ref instance index))
 
 (defun %instance-set (instance index new-value)
-  _N"Set the INDEXth slot of INSTANCE to NEW-VALUE."
+  "Set the INDEXth slot of INSTANCE to NEW-VALUE."
   (setf (%instance-ref instance index) new-value))
 
 (defun %raw-ref-single (vec index)
@@ -418,7 +418,7 @@
 ;;; DEFSTRUCT  --  Public
 ;;;
 (defmacro defstruct (name-and-options &rest slot-descriptions)
-  _N"DEFSTRUCT {Name | (Name Option*)} {Slot | (Slot [Default] {Key Value}*)}
+  "DEFSTRUCT {Name | (Name Option*)} {Slot | (Slot [Default] {Key Value}*)}
    Define the structure type Name.  Instances are created by MAKE-<name>, which
    takes keyword arguments allowing initial slot values to the specified.
    A SETF'able function <name>-<slot> is defined for each slot to read&write
@@ -1828,7 +1828,7 @@
 ;;;    Copy any old kind of structure.
 ;;;
 (defun copy-structure (structure)
-  _N"Return a copy of Structure with the same (EQL) slot values."
+  "Return a copy of Structure with the same (EQL) slot values."
   (declare (type structure-object structure) (optimize (speed 3) (safety 0)))
   (let* ((len (%instance-length structure))
 	 (res (%make-instance len))
diff --git a/code/describe.lisp b/code/describe.lisp
index 6e313a155e817c34e1a77f96a344fe461e877b28..329ba846b20c3cf0ee56a104a02df0257465f39e 100644
--- a/code/describe.lisp
+++ b/code/describe.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/describe.lisp,v 1.55 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/describe.lisp,v 1.56 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -36,39 +36,39 @@
 ;;;; DESCRIBE public switches.
 
 (defvar *describe-level* 2
-  _N"Depth of recursive descriptions allowed.")
+  "Depth of recursive descriptions allowed.")
 
 (defvar *describe-verbose* nil
-  _N"If non-nil, descriptions may provide interpretations of information and
+  "If non-nil, descriptions may provide interpretations of information and
   pointers to additional information.  Normally nil.")
 
 (defvar *describe-print-level* 2
-  _N"*print-level* gets bound to this inside describe.  If null, use
+  "*print-level* gets bound to this inside describe.  If null, use
   *print-level*")
 
 (defvar *describe-print-length* 5
-  _N"*print-length* gets bound to this inside describe.  If null, use
+  "*print-length* gets bound to this inside describe.  If null, use
   *print-length*.")
 
 (defvar *describe-indentation* 3
-  _N"Number of spaces that sets off each line of a recursive description.")
+  "Number of spaces that sets off each line of a recursive description.")
 
 (defvar *in-describe* nil
-  _N"Used to tell whether we are doing a recursive describe.")
+  "Used to tell whether we are doing a recursive describe.")
 (defvar *current-describe-level* 0
-  _N"Used to implement recursive description cutoff.  Don't touch.")
+  "Used to implement recursive description cutoff.  Don't touch.")
 (defvar *describe-output* nil
-  _N"An output stream used by Describe for indenting and stuff.")
+  "An output stream used by Describe for indenting and stuff.")
 (defvar *described-objects* nil
-  _N"List of all objects describe within the current top-level call to describe.")
+  "List of all objects describe within the current top-level call to describe.")
 (defvar *current-describe-object* nil
-  _N"The last object passed to describe.")
+  "The last object passed to describe.")
 
 ;;; DESCRIBE sets up the output stream and calls DESCRIBE-AUX, which does the
 ;;; hard stuff.
 ;;;
 (defun describe (x &optional stream)
-  _N"Prints a description of the object X."
+  "Prints a description of the object X."
   (declare (type (or stream (member t nil)) stream))
   (unless *describe-output*
     (setq *describe-output* (make-indenting-stream *standard-output*)))
diff --git a/code/dfixnum.lisp b/code/dfixnum.lisp
index 70c54e5c0b58ac4d93b21fb7fcf4af268bdeb6c6..0ce2090623d792c581524e239f25e4b558dcab97 100644
--- a/code/dfixnum.lisp
+++ b/code/dfixnum.lisp
@@ -5,7 +5,7 @@
 ;;; and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/dfixnum.lisp,v 1.4 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/dfixnum.lisp,v 1.5 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -61,7 +61,7 @@
   (l 0 :type dfparttype))
 
 (defun dfixnum-inc-df (v i)
-  _N"increments dfixnum v by dfixnum i"
+  "increments dfixnum v by dfixnum i"
   (declare (type dfixnum v) (type dfixnum i))
   (let ((low (+ (dfixnum-l v) (dfixnum-l i))))
     (if (> low dfmax)
@@ -81,7 +81,7 @@
   (setf (dfixnum-l v) (dfixnum-l i)))
 
 (defun dfixnum-inc-hf (v i)
-  _N"increments dfixnum v by i (max half fixnum)"
+  "increments dfixnum v by i (max half fixnum)"
   (declare (type dfixnum v) (type fixnum i))
   (when (> i dfmax)
       (error _"not a half-fixnum: ~a" i))
@@ -96,7 +96,7 @@
   v)
 
 (defun dfixnum-dec-df (v i)
-  _N"decrement dfixnum v by dfixnum i"
+  "decrement dfixnum v by dfixnum i"
   (declare (type dfixnum v) (type dfixnum i))
   (let ((low (- (dfixnum-l v) (dfixnum-l i)))
 	(high (- (dfixnum-h v) (dfixnum-h i))))
@@ -111,7 +111,7 @@
   v)
 
 (defun dfixnum-dec-hf (v i)
-  _N"decrement dfixnum v by half-fixnum i"
+  "decrement dfixnum v by half-fixnum i"
   (declare (type dfixnum v) (type (integer 0 #.dfmax) i))
   (let ((low (- (dfixnum-l v) i))
 	(high (dfixnum-h v)))
@@ -126,7 +126,7 @@
   v)
 
 (defun dfixnum-inc-integer (df i)
-  _N"increments dfixnum by an interger which may be bigger than fixnum.
+  "increments dfixnum by an interger which may be bigger than fixnum.
    May cons"
   (declare (type dfixnum df) (integer i) (optimize (ext:inhibit-warnings 3)))
   (let ((carry (+ (dfixnum-l df) (mod i dfmax))))
@@ -145,7 +145,7 @@
   (setf (dfixnum-l df) (mod i dfmax)))
 
 (defun dfixnum-make-from-number (i)
-  _N"returns a new dfixnum from number i"
+  "returns a new dfixnum from number i"
   (declare (type number i) (optimize (ext:inhibit-warnings 3)))
   (let ((df (make-dfixnum)))
     (declare (type dfixnum df))
@@ -190,7 +190,7 @@
      (setf ,l (dfixnum-l ,dfnum))))
 
 (defmacro dfixnum-inc-pair (vh vl ih il)
-  _N"increments a pair of halffixnums by another pair"
+  "increments a pair of halffixnums by another pair"
   `(progn
      (let ((low (+ ,vl ,il)))
        (if (> low dfmax)
@@ -207,7 +207,7 @@
   (+ (* h dfmax) l))
 
 (defmacro dfixnum-dec-pair (vh vl ih il)
-  _N"decrement dfixnum pair by another pair"
+  "decrement dfixnum pair by another pair"
   `(let ((low (- ,vl ,il))
 	 (high (- ,vh ,ih)))
      (declare (type fixnum low high))
diff --git a/code/env-access.lisp b/code/env-access.lisp
index 8b303717b80a941bcd68cd3d2fae3942bca11c45..152ead47533a0e73be8aaf6f69cedab6baebd5d2 100644
--- a/code/env-access.lisp
+++ b/code/env-access.lisp
@@ -6,7 +6,7 @@
 ;;;
 
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/env-access.lisp,v 1.6 2010/03/19 15:18:58 rtoy Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/env-access.lisp,v 1.7 2010/04/19 02:18:03 rtoy Exp $")
 
 ;;;
 ;;; **********************************************************************
@@ -28,7 +28,7 @@
 (in-package "C")
 
 (defun variable-information (var &optional env)
-  _N"Returns information about the symbol VAR in the lexical environment ENV.
+  "Returns information about the symbol VAR in the lexical environment ENV.
 Three values are returned:
   1) Type or binding of VAR.
      NIL           No definition or binding
@@ -76,7 +76,7 @@ Three values are returned:
 			   (info variable type var)))))))))
 
 (defun declaration-information (declaration-name &optional env)
-  _N"Returns information about declarations named by the symbol DECLARATION-NAME.
+  "Returns information about declarations named by the symbol DECLARATION-NAME.
 Supported DECLARATION-NAMES are
   1) OPTIMIZE
      A list whose entries are of the form (QUALITY VALUE) is returned,
@@ -126,7 +126,7 @@ Supported DECLARATION-NAMES are
       (t (error _"Unsupported declaration ~S." declaration-name)))))
 
 (defun parse-macro (name lambda-list body &optional env)
-  _N"Process a macro in the same way that DEFMACRO or MACROLET would.
+  "Process a macro in the same way that DEFMACRO or MACROLET would.
 Three values are returned:
   1) A lambda-expression that accepts two arguments
   2) A form
@@ -143,7 +143,7 @@ Three values are returned:
          ,body))))
 
 (defun function-information (function &optional env)
-  _N"Returns information about the function name FUNCTION in the lexical environment ENV.
+  "Returns information about the function name FUNCTION in the lexical environment ENV.
 Three values are returned:
   1) Type of definition or binding:
      NIL          No apparent definition
@@ -219,7 +219,7 @@ Three values are returned:
   `(quote ,env))
 
 (defun augment-environment (env &key variable symbol-macro function macro declare)
-  _N"Return a new environment containing information in ENV that is augmented
+  "Return a new environment containing information in ENV that is augmented
 by the specified parameters:
   :VARIABLE     a list of symbols visible as bound variables in the new
                 environemnt
diff --git a/code/error.lisp b/code/error.lisp
index a15d0fb1cda95489310067f13c238d1e47a3a5ef..33d04606cdc9449c84138ec58a25d0fdb296e189 100644
--- a/code/error.lisp
+++ b/code/error.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/error.lisp,v 1.89 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/error.lisp,v 1.90 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -101,7 +101,7 @@
 (defvar *condition-restarts* ())
 
 (defun compute-restarts (&optional condition)
-  _N"Return a list of all the currently active restarts ordered from most
+  "Return a list of all the currently active restarts ordered from most
    recently established to less recently established.  If Condition is
    specified, then only restarts associated with Condition (or with no
    condition) will be returned."
@@ -147,7 +147,7 @@
            stream))
 
 (defmacro with-condition-restarts (condition-form restarts-form &body body)
-  _N"WITH-CONDITION-RESTARTS Condition-Form Restarts-Form Form*
+  "WITH-CONDITION-RESTARTS Condition-Form Restarts-Form Form*
    Evaluates the Forms in a dynamic environment where the restarts in the list
    Restarts-Form are associated with the condition returned by Condition-Form.
    This allows FIND-RESTART, etc., to recognize restarts that are not related
@@ -162,7 +162,7 @@
        ,@body)))
 
 (defmacro restart-bind (bindings &body forms)
-  _N"Executes forms in a dynamic context where the given restart bindings are
+  "Executes forms in a dynamic context where the given restart bindings are
    in effect.  Users probably want to use RESTART-CASE.  When clauses contain
    the same restart name, FIND-RESTART will find the first such clause."
   `(let ((*restart-clusters*
@@ -183,7 +183,7 @@
      ,@forms))
 
 (defun find-restart (name &optional condition)
-  _N"Returns the first restart named name.  If name is a restart, it is returned
+  "Returns the first restart named name.  If name is a restart, it is returned
    if it is currently active.  If no such restart is found, nil is returned.
    It is an error to supply nil as a name.  If Condition is specified and not
    NIL, then only restarts associated with that condition (or with no
@@ -194,7 +194,7 @@
 	   (compute-restarts condition)))
 
 (defun invoke-restart (restart &rest values)
-  _N"Calls the function associated with the given restart, passing any given
+  "Calls the function associated with the given restart, passing any given
    arguments.  If the argument restart is not a restart or a currently active
    non-nil restart name, then a control-error is signalled."
   (let ((real-restart (find-restart restart)))
@@ -205,7 +205,7 @@
     (apply (restart-function real-restart) values)))
 
 (defun invoke-restart-interactively (restart)
-  _N"Calls the function associated with the given restart, prompting for any
+  "Calls the function associated with the given restart, prompting for any
    necessary arguments.  If the argument restart is not a restart or a
    currently active non-nil restart name, then a control-error is signalled."
   (let ((real-restart (find-restart restart)))
@@ -272,7 +272,7 @@
 ); eval-when (compile load eval)
 
 (defmacro restart-case (expression &body clauses &environment env)
-  _N"(RESTART-CASE form
+  "(RESTART-CASE form
    {(case-name arg-list {keyword value}* body)}*)
    The form is evaluated in a dynamic context where the clauses have special
    meanings as points to which control may be transferred (see INVOKE-RESTART).
@@ -345,7 +345,7 @@
 (defmacro with-simple-restart ((restart-name format-string
 					     &rest format-arguments)
 			       &body forms)
-  _N"(WITH-SIMPLE-RESTART (restart-name format-string format-arguments)
+  "(WITH-SIMPLE-RESTART (restart-name format-string format-arguments)
    body)
    If restart-name is not invoked, then all values returned by forms are
    returned.  If control is transferred to this restart, it immediately
@@ -548,7 +548,7 @@
 
 
 (defun make-condition (thing &rest args)
-  _N"Make an instance of a condition object using the specified initargs."
+  "Make an instance of a condition object using the specified initargs."
   ;; Note: ANSI specifies no exceptional situations in this function.
   ;; signalling simple-type-error would not be wrong.
   (let* ((thing (if (symbolp thing)
@@ -746,7 +746,7 @@
 
 (defmacro define-condition (name (&rest parent-types) (&rest slot-specs)
 				 &body options)
-  _N"DEFINE-CONDITION Name (Parent-Type*) (Slot-Spec*) Option*
+  "DEFINE-CONDITION Name (Parent-Type*) (Slot-Spec*) Option*
    Define NAME as a condition type.  This new type inherits slots and its
    report function from the specified PARENT-TYPEs.  A slot spec is either
    a symbol denoting the name of the slot, or a list of the form:
@@ -900,7 +900,7 @@
 (defvar *handler-clusters* nil)
 
 (defmacro handler-bind (bindings &body forms)
-  _N"(HANDLER-BIND ( {(type handler)}* )  body)
+  "(HANDLER-BIND ( {(type handler)}* )  body)
    Executes body in a dynamic context where the given handler bindings are
    in effect.  Each handler must take the condition being signalled as an
    argument.  The bindings are searched first to last in the event of a
@@ -1143,7 +1143,7 @@
 ;;; in closing over tags.  The previous version sets up unique run-time tags.
 ;;;
 (defmacro handler-case (form &rest cases)
-  _N"(HANDLER-CASE form
+  "(HANDLER-CASE form
    { (type ([var]) body) }* )
    Executes form in a context with handlers established for the condition
    types.  A peculiar property allows type to be :no-error.  If such a clause
@@ -1195,7 +1195,7 @@
 		     annotated-cases))))))))
 
 (defmacro ignore-errors (&rest forms)
-  _N"Executes forms after establishing a handler for all error conditions that
+  "Executes forms after establishing a handler for all error conditions that
    returns from this form nil and the condition signalled."
   `(handler-case (progn ,@forms)
      (error (condition) (values nil condition))))
@@ -1214,14 +1214,14 @@
 ;;; not tranfer control dynamically.  This could happen with RESTART-BIND.
 ;;;
 (defun abort (&optional condition)
-  _N"Transfers control to a restart named abort, signalling a control-error if
+  "Transfers control to a restart named abort, signalling a control-error if
    none exists."
   (invoke-restart (find-restart 'abort condition))
   (error 'abort-failure))
 
 
 (defun muffle-warning (&optional condition)
-  _N"Transfers control to a restart named muffle-warning, signalling a
+  "Transfers control to a restart named muffle-warning, signalling a
    control-error if none exists."
   (invoke-restart (find-restart 'muffle-warning condition)))
 
@@ -1237,12 +1237,12 @@
 	 (invoke-restart restart ,@args)))))
 
 (define-nil-returning-restart continue ()
-  _N"Transfer control to a restart named continue, returning nil if none exists.")
+  "Transfer control to a restart named continue, returning nil if none exists.")
 
 (define-nil-returning-restart store-value (value)
-  _N"Transfer control and value to a restart named store-value, returning nil if
+  "Transfer control and value to a restart named store-value, returning nil if
    none exists.")
 
 (define-nil-returning-restart use-value (value)
-  _N"Transfer control and value to a restart named use-value, returning nil if
+  "Transfer control and value to a restart named use-value, returning nil if
    none exists.")
diff --git a/code/eval.lisp b/code/eval.lisp
index a4764024d445c5e625499641f8fdcc56c076589f..564e53719dc793462f268d40c0c72eb793788194 100644
--- a/code/eval.lisp
+++ b/code/eval.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/eval.lisp,v 1.47 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/eval.lisp,v 1.48 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -65,20 +65,20 @@
 (defconstant lambda-list-keywords
   '(&optional &rest &key &aux &body &whole &allow-other-keys &environment
     &parse-body c:&more)
-  _N"Keywords that you can put in a lambda-list, supposing you should want
+  "Keywords that you can put in a lambda-list, supposing you should want
   to do such a thing.")
 
 (defconstant call-arguments-limit most-positive-fixnum
-  _N"The exclusive upper bound on the number of arguments which may be passed
+  "The exclusive upper bound on the number of arguments which may be passed
   to a function, including rest args.")
 
 (defconstant lambda-parameters-limit most-positive-fixnum
-  _N"The exclusive upper bound on the number of parameters which may be specifed
+  "The exclusive upper bound on the number of parameters which may be specifed
   in a given lambda list.  This is actually the limit on required and optional
   parameters.  With &key and &aux you can get more.")
 
 (defconstant multiple-values-limit most-positive-fixnum
-  _N"The exclusive upper bound on the number of multiple-values that you can
+  "The exclusive upper bound on the number of multiple-values that you can
   have.")
 
 
@@ -140,7 +140,7 @@
 (declaim (type (member :warn t nil) *top-level-auto-declare*))
 
 (defvar *top-level-auto-declare* :warn
-  _N"This variable controls whether assignments to unknown variables at top-level
+  "This variable controls whether assignments to unknown variables at top-level
    (or in any other call to EVAL of SETQ) will implicitly declare the variable
    SPECIAL.  These values are meaningful:
      :WARN  -- Print a warning, but declare the variable special (the default.)
@@ -153,7 +153,7 @@
 ;;;    Pick off a few easy cases, and call INTERNAL-EVAL for the rest.
 ;;;
 (defun eval (original-exp)
-  _N"Evaluates its single arg in a null lexical environment, returns the
+  "Evaluates its single arg in a null lexical environment, returns the
   result or results."
   (declare (optimize (safety 1)))
   (let ((exp (macroexpand original-exp)))
@@ -286,7 +286,7 @@
 ;;; compiled with COMPILE.  If that fails, check for an inline expansion.
 ;;;
 (defun function-lambda-expression (fun)
-  _N"Given a function, return three values:
+  "Given a function, return three values:
    1] A lambda expression that could be used to define the function, or NIL if
       the definition isn't available.
    2] NIL if the function was definitely defined in a null lexical environment,
@@ -331,12 +331,12 @@
 ;;;; Syntactic environment access:
 
 (defun special-operator-p (symbol)
-  _N"If the symbol globally names a special form, returns T, otherwise NIL."
+  "If the symbol globally names a special form, returns T, otherwise NIL."
   (declare (symbol symbol))
   (eq (info function kind symbol) :special-form))
 
 (defvar *macroexpand-hook* 'funcall
-  _N"The value of this variable must be a function that can take three
+  "The value of this variable must be a function that can take three
   arguments, a macro expander function, the macro form to be expanded,
   and the lexical environment to expand in.  The function should
   return the expanded form.  This function is called by MACROEXPAND-1
@@ -356,7 +356,7 @@
 ;;; it again.
 ;;; 
 (defun invoke-macroexpand-hook (fun form env)
-  _N"Invoke *MACROEXPAND-HOOK* on FUN, FORM, and ENV after coercing it to
+  "Invoke *MACROEXPAND-HOOK* on FUN, FORM, and ENV after coercing it to
    a function."
   (unless (functionp *macroexpand-hook*)
     (setf *macroexpand-hook*
@@ -364,7 +364,7 @@
   (funcall *macroexpand-hook* fun form env))
 
 (defun macro-function (symbol &optional env)
-  _N"If SYMBOL names a macro in ENV, returns the expansion function,
+  "If SYMBOL names a macro in ENV, returns the expansion function,
    else returns NIL.  If ENV is unspecified or NIL, use the global
    environment only."
   (declare (symbol symbol))
@@ -404,7 +404,7 @@
 ;;;    The Env is a LEXENV or NIL (the null environment.)
 ;;;
 (defun macroexpand-1 (form &optional env)
-  _N"If form is a macro (or symbol macro), expands it once.  Returns two values,
+  "If form is a macro (or symbol macro), expands it once.  Returns two values,
    the expanded form and a T-or-NIL flag indicating whether the form was, in
    fact, a macro.  Env is the lexical environment to expand in, which defaults
    to the null environment."
@@ -428,7 +428,7 @@
 	 (values form nil))))
 
 (defun macroexpand (form &optional env)
-  _N"Repetitively call MACROEXPAND-1 until the form can no longer be expanded.
+  "Repetitively call MACROEXPAND-1 until the form can no longer be expanded.
    Returns the final resultant form, and T if it was expanded.  ENV is the
    lexical environment to expand in, or NIL (the default) for the null
    environment."
@@ -442,7 +442,7 @@
     (frob form nil)))
 
 (defun compiler-macro-function (name &optional env)
-  _N"If NAME names a compiler-macro, returns the expansion function,
+  "If NAME names a compiler-macro, returns the expansion function,
    else returns NIL.  Note: if the name is shadowed in ENV by a local
    definition, or declared NOTINLINE, NIL is returned.  Can be
    set with SETF."
@@ -470,7 +470,7 @@
 ;;; trying to debug his compiler macros.
 
 (defun compiler-macroexpand-1 (form &optional env)
-  _N"If FORM is a function call for which a compiler-macro has been defined,
+  "If FORM is a function call for which a compiler-macro has been defined,
    invoke the expander function using *macroexpand-hook* and return the
    results and T.  Otherwise, return the original form and NIL."
   (let ((fun (and (consp form) (compiler-macro-function (car form) env))))
@@ -480,7 +480,7 @@
 	(values form nil))))
 
 (defun compiler-macroexpand (form &optional env)
-  _N"Repetitively call COMPILER-MACROEXPAND-1 until the form can no longer be
+  "Repetitively call COMPILER-MACROEXPAND-1 until the form can no longer be
    expanded.  ENV is the lexical environment to expand in, or NIL (the
    default) for the null environment."
   (labels ((frob (form expanded)
@@ -493,7 +493,7 @@
     (frob form env)))
 
 (defun constantp (object &optional environment)
-  _N"True of any Lisp object that has a constant value: types that eval to
+  "True of any Lisp object that has a constant value: types that eval to
   themselves, keywords, constants, and list whose car is QUOTE."
   (declare (ignore environment))
   (typecase object
@@ -510,7 +510,7 @@
 ;;; Function invocation:
 
 (defun apply (function arg &rest args)
-  _N"Applies FUNCTION to a list of arguments produced by evaluating ARGS in
+  "Applies FUNCTION to a list of arguments produced by evaluating ARGS in
   the manner of LIST*.  That is, a list is made of the values of all but the
   last argument, appended to the value of the last argument, which must be a
   list."
@@ -526,7 +526,7 @@
 
 
 (defun funcall (function &rest arguments)
-  _N"Calls Function with the given Arguments."
+  "Calls Function with the given Arguments."
   (apply function arguments))
 
 
@@ -534,9 +534,9 @@
 ;;; Multiple-Value forms:
 
 (defun values (&rest values)
-  _N"Returns all of its arguments, in order, as values."
+  "Returns all of its arguments, in order, as values."
   (values-list values))
 
 (defun values-list (list)
-  _N"Returns all of the elements of List, in order, as values."
+  "Returns all of the elements of List, in order, as values."
   (values-list list))
diff --git a/code/extensions.lisp b/code/extensions.lisp
index 8fd07d13ab49f8c397a2447e8bc736cee74e52b4..9d3bbea21c0a6b1ac222b138798404e030cf2322 100644
--- a/code/extensions.lisp
+++ b/code/extensions.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/extensions.lisp,v 1.29 2010/03/19 15:18:58 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/extensions.lisp,v 1.30 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -40,7 +40,7 @@
 ;;;
 (declaim (ftype (function () nil) required-argument))
 (defun required-argument ()
-  _N"This function can be used as the default value for keyword arguments that
+  "This function can be used as the default value for keyword arguments that
   must be always be supplied.  Since it is known by the compiler to never
   return, it will avoid any compile-time type warnings that would result from a
   default value inconsistent with the declared type.  When this function is
@@ -53,7 +53,7 @@
 ;;; FILE-COMMENT  --  Public
 ;;;
 (defmacro file-comment (string)
-  _N"FILE-COMMENT String
+  "FILE-COMMENT String
   When COMPILE-FILE sees this form at top-level, it places the constant string
   in the run-time source location information.  DESCRIBE will print the file
   comment for the file that a function was defined in.  The string is also
@@ -70,7 +70,7 @@
 
   
 (defun listen-skip-whitespace (&optional (stream *standard-input*))
-  _N"See listen.  Any whitespace in the input stream will be flushed."
+  "See listen.  Any whitespace in the input stream will be flushed."
   (do ((char (read-char-no-hang stream nil nil nil)
 	     (read-char-no-hang stream nil nil nil)))
       ((null char) nil)
@@ -81,7 +81,7 @@
 ;;; These macros waste time as opposed to space.
 
 (defmacro letf* (bindings &body body &environment env)
-  _N"Does what one might expect, saving the old values and setting the generalized
+  "Does what one might expect, saving the old values and setting the generalized
   variables to the new values in sequence.  Unwind-protects and get-setf-method
   are used to preserve the semantics one might expect in analogy to let*,
   and the once-only evaluation of subforms."
@@ -103,7 +103,7 @@
 
 
 (defmacro letf (bindings &body body &environment env)
-  _N"Like letf*, but evaluates all the implicit subforms and new values of all
+  "Like letf*, but evaluates all the implicit subforms and new values of all
   the implied setfs before altering any values.  However, the store forms
   (see get-setf-method) must still be evaluated in sequence.  Uses unwind-
   protects to protect the environment."
@@ -151,7 +151,7 @@
 ;;; the indentation of a stream.
 
 (defmacro indenting-further (stream more &rest body)
-  _N"Causes the output of the indenting Stream to indent More spaces.  More is
+  "Causes the output of the indenting Stream to indent More spaces.  More is
   evaluated twice."
   `(unwind-protect
      (progn
@@ -175,7 +175,7 @@
 
 
 (defmacro dovector ((elt vector &optional default) &rest forms)
-  _N"Just like dolist, but with one-dimensional arrays."
+  "Just like dolist, but with one-dimensional arrays."
   (let ((index (gensym))
 	(length (gensym))
 	(vec (gensym)))
@@ -201,7 +201,7 @@
 ;;;    The ultimate iteration macro...
 ;;;
 (defmacro iterate (name binds &body body)
-  _N"Iterate Name ({(Var Initial-Value)}*) Declaration* Form*
+  "Iterate Name ({(Var Initial-Value)}*) Declaration* Form*
   This is syntactic sugar for Labels.  It creates a local function Name with
   the specified Vars as its arguments and the Declarations and Forms as its
   body.  This function is then called with the Initial-Values, and the result
@@ -253,7 +253,7 @@
 ;;;    The ultimate collection macro...
 ;;;
 (defmacro collect (collections &body body)
-  _N"Collect ({(Name [Initial-Value] [Function])}*) {Form}*
+  "Collect ({(Name [Initial-Value] [Function])}*) {Form}*
   Collect some values somehow.  Each of the collections specifies a bunch of
   things which collected during the evaluation of the body of the form.  The
   name of the collection is used to define a local macro, a la MACROLET.
@@ -305,7 +305,7 @@
 ;;; forms are only evaluated once.
 ;;;
 (defmacro once-only (specs &body body)
-  _N"Once-Only ({(Var Value-Expression)}*) Form*
+  "Once-Only ({(Var Value-Expression)}*) Form*
   Create a Let* which evaluates each Value-Expression, binding a temporary
   variable to the result, and wrapping the Let* around the result of the
   evaluation of Body.  Within the body, each Var is bound to the corresponding
@@ -367,7 +367,7 @@
 
 
 (defmacro do-anonymous (varlist endlist &parse-body (body decls))
-  _N"DO-ANONYMOUS ({(Var [Init] [Step])}*) (Test Exit-Form*) Declaration* Form*
+  "DO-ANONYMOUS ({(Var [Init] [Step])}*) (Test Exit-Form*) Declaration* Form*
   Like DO, but has no implicit NIL block.  Each Var is initialized in parallel
   to the value of the specified Init form.  On subsequent iterations, the Vars
   are assigned the value of the Step form (if any) in paralell.  The Test is
@@ -379,7 +379,7 @@
 
 (defmacro do-hash ((key-var value-var table &optional result)
 		   &parse-body (body decls))
-  _N"DO-HASH (Key-Var Value-Var Table [Result]) Declaration* Form*
+  "DO-HASH (Key-Var Value-Var Table [Result]) Declaration* Form*
    Iterate over the entries in a hash-table."
   (let ((gen (gensym))
 	(n-more (gensym)))
@@ -405,7 +405,7 @@
 (defmacro define-hash-cache (name args &key hash-function hash-bits default
 				  (init-form 'progn)
 				  (values 1))
-  _N"DEFINE-HASH-CACHE Name ({(Arg-Name Test-Function)}*) {Key Value}*
+  "DEFINE-HASH-CACHE Name ({(Arg-Name Test-Function)}*) {Key Value}*
   Define a hash cache that associates some number of argument values to a
   result value.  The Test-Function paired with each Arg-Name is used to compare
   the value for that arg in a cache entry with a supplied arg.  The
@@ -579,7 +579,7 @@
 (defmacro defun-cached ((name &rest options &key (values 1) default
 			      &allow-other-keys)
 			args &parse-body (body decls doc))
-  _N"DEFUN-CACHED (Name {Key Value}*) ({(Arg-Name Test-Function)}*) Form*
+  "DEFUN-CACHED (Name {Key Value}*) ({(Arg-Name Test-Function)}*) Form*
   Some syntactic sugar for defining a function whose values are cached by
   DEFINE-HASH-CACHE."
   (let ((default-values (if (and (consp default) (eq (car default) 'values))
@@ -609,6 +609,6 @@
 ;;; CACHE-HASH-EQ  -- Public
 ;;;
 (defmacro cache-hash-eq (x)
-  _N"Return an EQ hash of X.  The value of this hash for any given object can (of
+  "Return an EQ hash of X.  The value of this hash for any given object can (of
   course) change at arbitary times."
   `(lisp::pointer-hash ,x))
diff --git a/code/extfmts.lisp b/code/extfmts.lisp
index ebbe7d15cba4a4f2574aa0635ff4bd2f44479ed4..a60783b75357880e4558d396e213cffecad11eca 100644
--- a/code/extfmts.lisp
+++ b/code/extfmts.lisp
@@ -5,7 +5,7 @@
 ;;; domain.
 ;;; 
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/extfmts.lisp,v 1.23 2010/03/19 15:18:58 rtoy Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/extfmts.lisp,v 1.24 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -683,7 +683,7 @@
 
 (defun string-to-octets (string &key (start 0) end (external-format :default)
 				     (buffer nil bufferp))
-  _N"Convert String to octets using the specified External-format.  The
+  "Convert String to octets using the specified External-format.  The
    string is bounded by Start (defaulting to 0) and End (defaulting to
    the end of the string.  If Buffer is given, the octets are stored
    there.  If not, a new buffer is created."
@@ -723,7 +723,7 @@
 				     (string nil stringp)
 			             (s-start 0) (s-end nil s-end-p)
 			             (state nil))
-  _N"Octets-to-string converts an array of octets in Octets to a string
+  "Octets-to-string converts an array of octets in Octets to a string
   according to the specified External-format.  The array of octets is
   bounded by Start (defaulting ot 0) and End (defaulting to the end of
   the array.  If String is not given, a new string is created.  If
@@ -773,7 +773,7 @@
 			     (code-char b)))))))
 
 (defun string-encode (string external-format &optional (start 0) end)
-  _N"Encode the given String using External-Format and return a new
+  "Encode the given String using External-Format and return a new
   string.  The characters of the new string are the octets of the
   encoded result, with each octet converted to a character via
   code-char.  This is the inverse to String-Decode"
@@ -806,7 +806,7 @@
 	finally (return (values result (1+ pos))))))
 
 (defun string-decode (string external-format &optional (start 0) end)
-  _N"Decode String using the given External-Format and return the new
+  "Decode String using the given External-Format and return the new
   string.  The input string is treated as if it were an array of
   octets, where the char-code of each character is the octet.  This is
   the inverse of String-Encode."
@@ -820,7 +820,7 @@
 
 
 (defun set-system-external-format (terminal &optional filenames)
-  _N"Change the external format of the standard streams to Terminal.
+  "Change the external format of the standard streams to Terminal.
   The standard streams are sys::*stdin*, sys::*stdout*, and
   sys::*stderr*, which are normally the input and/or output streams
   for *standard-input* and *standard-output*.  Also sets sys::*tty*
diff --git a/code/fd-stream.lisp b/code/fd-stream.lisp
index ceb0db70034b100b58b311109593d341dd83755f..e1729abe127e9f05f668a912c44c9c29f84c1062 100644
--- a/code/fd-stream.lisp
+++ b/code/fd-stream.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.98 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.99 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -40,17 +40,17 @@
 ;;;; Buffer manipulation routines.
 
 (defvar *available-buffers* ()
-  _N"List of available buffers.  Each buffer is an sap pointing to
+  "List of available buffers.  Each buffer is an sap pointing to
   bytes-per-buffer of memory.")
 
 (defvar lisp::*enable-stream-buffer-p* nil)
 
 (defconstant bytes-per-buffer (* 4 1024)
-  _N"Number of bytes per buffer.")
+  "Number of bytes per buffer.")
 
 ;; This limit is rather arbitrary
 (defconstant max-stream-element-size 1024
-  _N"The maximum supported byte size for a stream element-type.")
+  "The maximum supported byte size for a stream element-type.")
 
 ;;; NEXT-AVAILABLE-BUFFER -- Internal.
 ;;;
@@ -296,7 +296,7 @@
 ;;;; Output routines and related noise.
 
 (defvar *output-routines* ()
-  _N"List of all available output routines. Each element is a list of the
+  "List of all available output routines. Each element is a list of the
   element-type output, the kind of buffering, the function name, and the number
   of bytes per element.")
 
@@ -593,7 +593,7 @@
 ;;; send it directly (after flushing the buffer, of course).
 ;;;
 (defun output-raw-bytes (stream thing &optional start end)
-  _N"Output THING to stream.  THING can be any kind of vector or a sap.  If THING
+  "Output THING to stream.  THING can be any kind of vector or a sap.  If THING
   is a SAP, END must be supplied (as length won't work)."
   (let ((start (or start 0))
 	(end (or end (length (the (simple-array * (*)) thing)))))
@@ -825,7 +825,7 @@
 ;;;; Input routines and related noise.
 
 (defvar *input-routines* ()
-  _N"List of all available input routines. Each element is a list of the
+  "List of all available input routines. Each element is a list of the
   element-type input, the function name, and the number of bytes per element.")
 
 ;;; DO-INPUT -- internal
@@ -1772,7 +1772,7 @@
 		       binary-stream-p)
   (declare (type index fd) (type (or index null) timeout)
 	   (type (member :none :line :full) buffering))
-  _N"Create a stream for the given unix file descriptor.
+  "Create a stream for the given unix file descriptor.
   If input is non-nil, allow input operations.
   If output is non-nil, allow output operations.
   If neither input nor output are specified, default to allowing input.
@@ -1831,7 +1831,7 @@
 ;;; Pick a name to use for the backup file.
 ;;;
 (defvar *backup-extension* ".BAK"
-  _N"This is a string that OPEN tacks on the end of a file namestring to produce
+  "This is a string that OPEN tacks on the end of a file namestring to produce
    a name for the :if-exists :rename-and-delete and :rename options.  Also,
    this can be a function that takes a namestring and returns a complete
    namestring.")
@@ -2133,7 +2133,7 @@
 		      (direction direction)
 		      (if-does-not-exist if-does-not-exist)
 		      (if-exists if-exists))
-  _N"Return a stream which reads from or writes to Filename.
+  "Return a stream which reads from or writes to Filename.
   Defined keywords:
    :direction - one of :input, :output, :io, or :probe
    :element-type - Type of object to read or write, default BASE-CHAR
@@ -2213,13 +2213,13 @@
 ;;;; Initialization.
 
 (defvar *tty* nil
-  _N"The stream connected to the controlling terminal or NIL if there is none.")
+  "The stream connected to the controlling terminal or NIL if there is none.")
 (defvar *stdin* nil
-  _N"The stream connected to the standard input (file descriptor 0).")
+  "The stream connected to the standard input (file descriptor 0).")
 (defvar *stdout* nil
-  _N"The stream connected to the standard output (file descriptor 1).")
+  "The stream connected to the standard output (file descriptor 1).")
 (defvar *stderr* nil
-  _N"The stream connected to the standard error output (file descriptor 2).")
+  "The stream connected to the standard error output (file descriptor 2).")
 
 ;;; STREAM-INIT -- internal interface
 ;;;
@@ -2271,7 +2271,7 @@
   (finish-output stream))
 
 (defvar *beep-function* #'default-beep-function
-  _N"This is called in BEEP to feep the user.  It takes a stream.")
+  "This is called in BEEP to feep the user.  It takes a stream.")
 
 (defun beep (&optional (stream *terminal-io*))
   (funcall *beep-function* stream))
@@ -2333,7 +2333,7 @@
 (defun file-string-length (stream object)
   (declare (type (or string character) object)
 	   (type (or file-stream broadcast-stream stream:simple-stream) stream))
-  _N"Return the delta in Stream's FILE-POSITION that would be caused by writing
+  "Return the delta in Stream's FILE-POSITION that would be caused by writing
    Object to Stream.  Non-trivial only in implementations that support
    international character sets."
   (typecase stream
diff --git a/code/fdefinition.lisp b/code/fdefinition.lisp
index 98b336e39a66cf11c297db750086ea37a93110ed..e7831208dcd9db2fda1d0b148804c667aa880f4e 100644
--- a/code/fdefinition.lisp
+++ b/code/fdefinition.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fdefinition.lisp,v 1.27 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fdefinition.lisp,v 1.28 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -52,7 +52,7 @@
 	      (acons name syntax-checker *valid-function-names*)))))
 
 (defmacro define-function-name-syntax (name (var) &body body)
-  _N"Define (NAME ...) to be a valid function name whose syntax is checked
+  "Define (NAME ...) to be a valid function name whose syntax is checked
   by BODY.  In BODY, VAR is bound to an actual function name of the
   form (NAME ...) to check.  BODY should return two values.
   First value true means the function name is valid.  Second value
@@ -64,7 +64,7 @@
        (%define-function-name-syntax ',name #',syntax-checker))))
 
 (defun valid-function-name-p (name)
-  _N"First value is true if NAME has valid function name syntax.
+  "First value is true if NAME has valid function name syntax.
   Second value is the name, a symbol, to use as a block name in DEFUNs
   and in similar situations."
   (typecase name
@@ -157,7 +157,7 @@
 ;;; FDEFINITION-OBJECT -- internal interface.
 ;;;
 (defun fdefinition-object (name create)
-  _N"Return the fdefn object for NAME.  If it doesn't already exist and CREATE
+  "Return the fdefn object for NAME.  If it doesn't already exist and CREATE
    is non-NIL, create a new (unbound) one."
   (declare (values (or fdefn null)))
   (multiple-value-bind (valid-name-p fname)
@@ -175,7 +175,7 @@
 
 (declaim (inline fdefn-or-lose))
 (defun fdefn-or-lose (name)
-  _N"Return the FDEFN of NAME.  Signal an error if there is none
+  "Return the FDEFN of NAME.  Signal an error if there is none
    or if it's function is null."
   (let ((fdefn (fdefinition-object name nil)))
     (unless (and fdefn (fdefn-function fdefn))
@@ -187,7 +187,7 @@
 ;;; The compiler emits calls to this when someone tries to funcall a symbol.
 ;;;
 (defun %coerce-to-function (name)
-  _N"Returns the definition for name, including any encapsulations.  Settable
+  "Returns the definition for name, including any encapsulations.  Settable
    with SETF."
   (fdefn-function (fdefn-or-lose name)))
 
@@ -210,7 +210,7 @@
 ;;;; FDEFINITION.
 
 (defun fdefinition (function-name)
-  _N"Return FUNCTION-NAME's global function definition.
+  "Return FUNCTION-NAME's global function definition.
    If FUNCTION-NAME is fwrapped, return the primary function definition
    stored in the innermost fwrapper."
   (let* ((fdefn (fdefn-or-lose function-name))
@@ -220,11 +220,11 @@
 	  (fdefn-function fdefn))))
 
 (defvar *setf-fdefinition-hook* nil
-  _N"This holds functions that (SETF FDEFINITION) invokes before storing the
+  "This holds functions that (SETF FDEFINITION) invokes before storing the
    new value.  These functions take the function name and the new value.")
 
 (defun %set-fdefinition (function-name new-value)
-  _N"Set FUNCTION-NAME's global function definition to NEW-VALUE.
+  "Set FUNCTION-NAME's global function definition to NEW-VALUE.
    If FUNCTION-NAME is fwrapped, set the primary function stored
    in the innermost fwrapper."
   (declare (type function new-value) (optimize (safety 1)))
@@ -244,12 +244,12 @@
 ;;;; FBOUNDP and FMAKUNBOUND.
 
 (defun fboundp (name)
-  _N"Return true if name has a global function definition."
+  "Return true if name has a global function definition."
   (let ((fdefn (fdefinition-object name nil)))
     (and fdefn (fdefn-function fdefn) t)))
 
 (defun fmakunbound (name)
-  _N"Make Name have no global function definition."
+  "Make Name have no global function definition."
   (let ((fdefn (fdefinition-object name nil)))
     (when fdefn
       (fdefn-makunbound fdefn)))
diff --git a/code/filesys.lisp b/code/filesys.lisp
index 536834814438f6072b37d9819a491332dfafe27d..2e9815766afef1802e39e6346ef809371976a3f6 100644
--- a/code/filesys.lisp
+++ b/code/filesys.lisp
@@ -6,7 +6,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.108 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.109 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -72,7 +72,7 @@
 ;;;
 
 (defun remove-backslashes (namestr start end)
-  _N"Remove any occurrences of \\ from the string because we've already
+  "Remove any occurrences of \\ from the string because we've already
    checked for whatever may have been backslashed."
   (declare (type simple-base-string namestr)
 	   (type index start end))
@@ -100,7 +100,7 @@
     (shrink-vector result dst)))
 
 (defvar *ignore-wildcards* nil
-  _N"If non-NIL, Unix shell-style wildcards are ignored when parsing
+  "If non-NIL, Unix shell-style wildcards are ignored when parsing
   pathname namestrings.  They are also ignored when computing
   namestrings for pathname objects.  Thus, *, ?, etc. are not
   wildcards when parsing a namestring, and are not escaped when
@@ -854,7 +854,7 @@
 ;;;; UNIX-NAMESTRING -- public
 ;;; 
 (defun unix-namestring (pathname &optional (for-input t) executable-only)
-  _N"Convert PATHNAME into a string that can be used with UNIX system calls.
+  "Convert PATHNAME into a string that can be used with UNIX system calls.
    Search-lists and wild-cards are expanded. If optional argument
    FOR-INPUT is true and PATHNAME doesn't exist, NIL is returned.
    If optional argument EXECUTABLE-ONLY is true, NIL is returned
@@ -890,7 +890,7 @@
 ;;; Another silly file function trivially different from another function.
 ;;;
 (defun truename (pathname)
-  _N"Return the pathname for the actual file described by the pathname
+  "Return the pathname for the actual file described by the pathname
   An error of type file-error is signalled if no such file exists,
   or the pathname is wild."
   (if (wild-pathname-p pathname)
@@ -910,7 +910,7 @@
 ;;; If PATHNAME exists, return its truename, otherwise NIL.
 ;;;
 (defun probe-file (pathname)
-  _N"Return a pathname which is the truename of the file if it exists, NIL
+  "Return a pathname which is the truename of the file if it exists, NIL
   otherwise. An error of type file-error is signalled if pathname is wild."
   (if (wild-pathname-p pathname)
       (error 'simple-file-error 
@@ -931,7 +931,7 @@
 ;;; Rename-File  --  Public
 ;;;
 (defun rename-file (file new-name)
-  _N"Rename File to have the specified New-Name.  If file is a stream open to a
+  "Rename File to have the specified New-Name.  If file is a stream open to a
   file, then the associated file is renamed."
   (let* ((original (truename file))
 	 (original-namestring (unix-namestring original t))
@@ -960,7 +960,7 @@
 ;;;    Delete the file, Man.
 ;;;
 (defun delete-file (file)
-  _N"Delete the specified file."
+  "Delete the specified file."
   (let ((namestring (unix-namestring file t)))
     (when (streamp file)
       ;; Close the file, but don't try to revert or anything.  We want
@@ -986,7 +986,7 @@
 ;;;    Purge old file versions
 ;;;
 (defun purge-backup-files (pathname &optional (keep 0))
-  _N"Delete old versions of files matching the given Pathname,
+  "Delete old versions of files matching the given Pathname,
 optionally keeping some of the most recent old versions."
   (declare (type (or pathname string stream) pathname)
 	   (type (integer 0 *) keep))
@@ -1021,7 +1021,7 @@ optionally keeping some of the most recent old versions."
 ;;;    Return Home:, which is set up for us at initialization time.
 ;;;
 (defun user-homedir-pathname (&optional host)
-  _N"Returns the home directory of the logged in user as a pathname.
+  "Returns the home directory of the logged in user as a pathname.
   This is obtained from the logical name \"home:\"."
   (declare (ignore host))
   #p"home:")
@@ -1029,7 +1029,7 @@ optionally keeping some of the most recent old versions."
 ;;; File-Write-Date  --  Public
 ;;;
 (defun file-write-date (file)
-  _N"Return file's creation date, or NIL if it doesn't exist.
+  "Return file's creation date, or NIL if it doesn't exist.
  An error of type file-error is signalled if file is a wild pathname"
   (if (wild-pathname-p file)
       (error 'simple-file-error 
@@ -1047,7 +1047,7 @@ optionally keeping some of the most recent old versions."
 ;;; File-Author  --  Public
 ;;;
 (defun file-author (file)
-  _N"Returns the file author as a string, or nil if the author cannot be
+  "Returns the file author as a string, or nil if the author cannot be
  determined.  Signals an error of type file-error if file doesn't exist,
  or file is a wild pathname."
   (if (wild-pathname-p file)
@@ -1075,7 +1075,7 @@ optionally keeping some of the most recent old versions."
 ;;;
 (defun directory (pathname &key (all t) (check-for-subdirs t)
 		  (truenamep t) (follow-links t))
-  _N"Returns a list of pathnames, one for each file that matches the given
+  "Returns a list of pathnames, one for each file that matches the given
    pathname.  Supplying :ALL as nil causes this to ignore Unix dot files.  This
    never includes Unix dot and dot-dot in the result.  If :TRUENAMEP is NIL,
    then symbolic links in the result are not expanded, which is not the
@@ -1124,7 +1124,7 @@ optionally keeping some of the most recent old versions."
 ;;; PRINT-DIRECTORY is exported from the EXTENSIONS package.
 ;;; 
 (defun print-directory (pathname &optional stream &key all verbose return-list)
-  _N"Like Directory, but prints a terse, multi-column directory listing
+  "Like Directory, but prints a terse, multi-column directory listing
    instead of returning a list of pathnames.  When :all is supplied and
    non-nil, then Unix dot files are included too (as ls -a).  When :verbose
    is supplied and non-nil, then a long listing of miscellaneous
@@ -1331,7 +1331,7 @@ optionally keeping some of the most recent old versions."
 ;;;
 (defun ambiguous-files (pathname
 			&optional (defaults *default-pathname-defaults*))
-  _N"Return a list of all files which are possible completions of Pathname.
+  "Return a list of all files which are possible completions of Pathname.
    We look in the directory specified by Defaults as well as looking down
    the search list."
   (directory (complete-file-directory-arg pathname defaults)
@@ -1346,7 +1346,7 @@ optionally keeping some of the most recent old versions."
 ;;;   can be written by the current task.
 ;;;
 (defun file-writable (name)
-  _N"File-writable accepts a pathname and returns T if the current
+  "File-writable accepts a pathname and returns T if the current
   process can write it, and NIL otherwise."
   (let ((name (unix-namestring name nil)))
     (cond ((null name)
@@ -1381,7 +1381,7 @@ optionally keeping some of the most recent old versions."
 ;;; Default-Directory  --  Public
 ;;;
 (defun default-directory ()
-  _N"Returns the pathname for the default directory.  This is the place where
+  "Returns the pathname for the default directory.  This is the place where
   a file will be written if no directory is specified.  This may be changed
   with setf."
   (multiple-value-bind (gr dir-or-error)
@@ -1411,7 +1411,7 @@ optionally keeping some of the most recent old versions."
 ;;; Seems like maybe it's fixed by changes made by Ray Toy to avoid heap corruption.
 #- (and)
 (defun default-directory ()
-  _N"Returns the pathname for the default directory.  This is the place where
+  "Returns the pathname for the default directory.  This is the place where
   a file will be written if no directory is specified.  This may be changed
   with setf."
   (multiple-value-bind (gr dir-or-error)
@@ -1455,7 +1455,7 @@ optionally keeping some of the most recent old versions."
 ;;; Ensure-Directories-Exist  --  Public
 ;;;
 (defun ensure-directories-exist (pathspec &key verbose (mode #o777))
-  _N"Tests whether the directories containing the specified file
+  "Tests whether the directories containing the specified file
   actually exist, and attempts to create them if they do not.
   Portable programs should avoid using the :MODE keyword argument."
   (let* ((pathname (pathname pathspec))
diff --git a/code/final.lisp b/code/final.lisp
index d5db797b2a5ed5b32c2f53fa6cdb9818503d8c18..7b69bd4fe3d9b5de00fd3c39fee0e8bb4453df62 100644
--- a/code/final.lisp
+++ b/code/final.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/final.lisp,v 1.4 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/final.lisp,v 1.5 2010/04/19 02:18:03 rtoy Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -22,7 +22,7 @@
 (defvar *objects-pending-finalization* nil)
 
 (defun finalize (object function)
-  _N"Arrange for FUNCTION to be called when there are no more references to
+  "Arrange for FUNCTION to be called when there are no more references to
    OBJECT.  FUNCTION takes no arguments."
   (declare (type function function))
   (system:without-gcing
@@ -31,7 +31,7 @@
   object)
 
 (defun cancel-finalization (object)
-  _N"Cancel any finalization registers for OBJECT."
+  "Cancel any finalization registers for OBJECT."
   (when object
     ;; We check to make sure object isn't nil because if there are any
     ;; broken weak pointers, their value will show up as nil.  Therefore,
diff --git a/code/float-trap.lisp b/code/float-trap.lisp
index 124e5d126c02461c48a6054798fbbea156a58333..37820add9ca180b9e0949f8df4af417e28335bd0 100644
--- a/code/float-trap.lisp
+++ b/code/float-trap.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/float-trap.lisp,v 1.36 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/float-trap.lisp,v 1.37 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -126,7 +126,7 @@
 				      (current-exceptions nil current-x-p)
 				      (accrued-exceptions nil accrued-x-p)
 				      (fast-mode nil fast-mode-p))
-  _N"This function sets options controlling the floating-point hardware.  If a
+  "This function sets options controlling the floating-point hardware.  If a
   keyword is not supplied, then the current value is preserved.  Possible
   keywords:
 
@@ -187,7 +187,7 @@
 ;;; GET-FLOATING-POINT-MODES  --  Public
 ;;;
 (defun get-floating-point-modes ()
-  _N"This function returns a list representing the state of the floating point
+  "This function returns a list representing the state of the floating point
   modes.  The list is in the same format as the keyword arguments to
   SET-FLOATING-POINT-MODES, i.e. 
       (apply #'set-floating-point-modes (get-floating-point-modes))
@@ -214,7 +214,7 @@
 ;;; CURRENT-FLOAT-TRAP  --  Interface
 ;;;
 (defmacro current-float-trap (&rest traps)
-  _N"Current-Float-Trap Trap-Name*
+  "Current-Float-Trap Trap-Name*
   Return true if any of the named traps are currently trapped, false
   otherwise."
   `(not (zerop (logand ,(dpb (float-trap-mask traps) float-traps-byte 0)
@@ -295,7 +295,7 @@
 ;;; WITH-FLOAT-TRAPS-MASKED  --  Public
 ;;;
 (defmacro with-float-traps-masked (traps &body body)
-  _N"Execute BODY with the floating point exceptions listed in TRAPS
+  "Execute BODY with the floating point exceptions listed in TRAPS
   masked (disabled).  TRAPS should be a list of possible exceptions
   which includes :UNDERFLOW, :OVERFLOW, :INEXACT, :INVALID and
   :DIVIDE-BY-ZERO and on the X86 :DENORMALIZED-OPERAND. The respective
diff --git a/code/float.lisp b/code/float.lisp
index 19ce751344204dfd405e8b15680f9ac2fe36d219..40e132281543578dd4c485169a1520666d38a5af 100644
--- a/code/float.lisp
+++ b/code/float.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/float.lisp,v 1.46 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/float.lisp,v 1.47 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -246,7 +246,7 @@
 ;;; FLOAT-DENORMALIZED-P  --  Public
 ;;;
 (defun float-denormalized-p (x)
-  _N"Return true if the float X is denormalized."
+  "Return true if the float X is denormalized."
   (number-dispatch ((x float))
     ((single-float)
      (and (zerop (ldb vm:single-float-exponent-byte (single-float-bits x)))
@@ -290,7 +290,7 @@
 		  ((double-double-float)
 		   ,double-double)))))
 
-  (frob float-infinity-p _N"Return true if the float X is an infinity (+ or -)."
+  (frob float-infinity-p "Return true if the float X is an infinity (+ or -)."
     (zerop (ldb vm:single-float-significand-byte bits))
     (and (zerop (ldb vm:double-float-significand-byte hi))
 	 (zerop lo))
@@ -300,7 +300,7 @@
     #+double-double
     (float-infinity-p (double-double-hi x)))
 
-  (frob float-nan-p _N"Return true if the float X is a NaN (Not a Number)."
+  (frob float-nan-p "Return true if the float X is a NaN (Not a Number)."
     (not (zerop (ldb vm:single-float-significand-byte bits)))
     (or (not (zerop (ldb vm:double-float-significand-byte hi)))
 	(not (zerop lo)))
@@ -311,7 +311,7 @@
     (float-nan-p (double-double-hi x)))
 
   (frob float-trapping-nan-p
-    _N"Return true if the float X is a trapping NaN (Not a Number)."
+    "Return true if the float X is a trapping NaN (Not a Number)."
     (zerop (logand (ldb vm:single-float-significand-byte bits)
 		   vm:single-float-trapping-nan-bit))
     (zerop (logand (ldb vm:double-float-significand-byte hi)
@@ -331,7 +331,7 @@
 ;;;
 (declaim (maybe-inline float-precision))
 (defun float-precision (f)
-  _N"Returns a non-negative number of significant digits in it's float argument.
+  "Returns a non-negative number of significant digits in it's float argument.
   Will be less than FLOAT-DIGITS if denormalized or zero."
   (macrolet ((frob (digits bias decode)
 	       `(cond ((zerop f) 0)
@@ -382,7 +382,7 @@
 
 #+nil
 (defun float-sign (float1 &optional (float2 (float 1 float1)))
-  _N"Returns a floating-point number that has the same sign as
+  "Returns a floating-point number that has the same sign as
    float1 and, if float2 is given, has the same absolute value
    as float2."
   (declare (float float1 float2))
@@ -398,7 +398,7 @@
      (abs float2)))
 
 (defun float-sign (float1 &optional float2)
-  _N"Returns a floating-point number that has the same sign as
+  "Returns a floating-point number that has the same sign as
    float1 and, if float2 is given, has the same absolute value
    as float2."
   (declare (float float1)
@@ -433,7 +433,7 @@
 (declaim (inline float-digits float-radix))
 
 (defun float-digits (f)
-  _N"Returns a non-negative number of radix-b digits used in the
+  "Returns a non-negative number of radix-b digits used in the
    representation of it's argument.  See Common Lisp: The Language
    by Guy Steele for more details."
   (number-dispatch ((f float))
@@ -445,7 +445,7 @@
     ((double-double-float) vm:double-double-float-digits)))
 
 (defun float-radix (f)
-  _N"Returns (as an integer) the radix b of its floating-point
+  "Returns (as an integer) the radix b of its floating-point
    argument."
   (number-dispatch ((f float))
     ((float) 2)))
@@ -647,7 +647,7 @@
 ;;;    Dispatch to the correct type-specific i-d-f function.
 ;;;
 (defun integer-decode-float (x)
-  _N"Returns three values:
+  "Returns three values:
    1) an integer representation of the significand.
    2) the exponent for the power of 2 that the significand must be multiplied
       by to get the actual value.  This differs from the DECODE-FLOAT exponent
@@ -808,7 +808,7 @@
 ;;;    Dispatch to the appropriate type-specific function.
 ;;;
 (defun decode-float (f)
-  _N"Returns three values:
+  "Returns three values:
    1) a floating-point number representing the significand.  This is always
       between 0.5 (inclusive) and 1.0 (exclusive).
    2) an integer representing the exponent.
@@ -960,7 +960,7 @@
 ;;;    Dispatch to the correct type-specific scale-float function.
 ;;;
 (defun scale-float (f ex)
-  _N"Returns the value (* f (expt (float 2 f) ex)), but with no unnecessary loss
+  "Returns the value (* f (expt (float 2 f) ex)), but with no unnecessary loss
   of precision or overflow."
   (number-dispatch ((f float))
     ((single-float)
@@ -978,7 +978,7 @@
 ;;;; Converting to/from floats:
 
 (defun float (number &optional (other () otherp))
-  _N"Converts any REAL to a float.  If OTHER is not provided, it returns a
+  "Converts any REAL to a float.  If OTHER is not provided, it returns a
   SINGLE-FLOAT if NUMBER is not already a FLOAT.  If OTHER is provided, the
   result is the same float format as OTHER."
   (if otherp
@@ -1495,7 +1495,7 @@ rounding modes & do ieee round-to-integer.
 ) ; not x87
 
 (defun rational (x)
-  _N"RATIONAL produces a rational number for any real numeric argument.  This is
+  "RATIONAL produces a rational number for any real numeric argument.  This is
   more efficient than RATIONALIZE, but it assumes that floating-point is
   completely accurate, giving a result that isn't as pretty."
   (number-dispatch ((x real))
@@ -1516,7 +1516,7 @@ rounding modes & do ieee round-to-integer.
 
 #+nil
 (defun rationalize (x)
-  _N"Converts any REAL to a RATIONAL.  Floats are converted to a simple rational
+  "Converts any REAL to a RATIONAL.  Floats are converted to a simple rational
   representation exploiting the assumption that floats are only accurate to
   their precision.  RATIONALIZE (and also RATIONAL) preserve the invariant:
       (= x (float (rationalize x) x))"
@@ -1615,7 +1615,7 @@ rounding modes & do ieee round-to-integer.
 ;;;   p[i]*q[i-1]-p[i-1]*q[i] = (-1)^i.
 ;;;
 (defun rationalize (x)
-  _N"Converts any REAL to a RATIONAL.  Floats are converted to a simple rational
+  "Converts any REAL to a RATIONAL.  Floats are converted to a simple rational
   representation exploiting the assumption that floats are only accurate to
   their precision.  RATIONALIZE (and also RATIONAL) preserve the invariant:
       (= x (float (rationalize x) x))"
diff --git a/code/format-time.lisp b/code/format-time.lisp
index afe0a980dcb3c5736a8e075dd22cf68855acfa5c..c0326dec65936d041ee84962c3cf19fa11b827cb 100644
--- a/code/format-time.lisp
+++ b/code/format-time.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format-time.lisp,v 1.10 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format-time.lisp,v 1.11 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 
@@ -65,7 +65,7 @@
 					  (print-meridian t)
 					  (print-timezone t)
 					  (print-weekday t))
-  _N"Format-Universal-Time formats a string containing the time and date
+  "Format-Universal-Time formats a string containing the time and date
    given by universal-time in a common manner.  The destination is any
    destination which can be accepted by the Format function.  The
    timezone keyword is an integer specifying hours west of Greenwich.
@@ -220,7 +220,7 @@
 					  (print-meridian t)
 					  (print-timezone t)
 					  (print-weekday t))
-  _N"Format-Decoded-Time formats a string containing decoded-time
+  "Format-Decoded-Time formats a string containing decoded-time
    expressed in a humanly-readable manner.  The destination is any
    destination which can be accepted by the Format function.  The
    timezone keyword is an integer specifying hours west of Greenwich.
diff --git a/code/format.lisp b/code/format.lisp
index 4e72c6ab1f4bc2648ca411b22a4914a542b2b69e..8732170774c2d983157ad13b64d9f4230272d864 100644
--- a/code/format.lisp
+++ b/code/format.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format.lisp,v 1.94 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format.lisp,v 1.95 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -267,7 +267,7 @@
 ;;;; FORMAT
 
 (defun format (destination control-string &rest format-arguments)
-  _N"Provides various facilities for formatting output.
+  "Provides various facilities for formatting output.
   CONTROL-STRING contains a string to be output, possibly with embedded
   directives, which are flagged with the escape character \"~\".  Directives
   generally expand into additional text to be output, usually consuming one
@@ -1378,12 +1378,12 @@
 (defconstant ordinal-ones
   #(nil "first" "second" "third" "fourth"
 	"fifth" "sixth" "seventh" "eighth" "ninth")
-  _N"Table of ordinal ones-place digits in English")
+  "Table of ordinal ones-place digits in English")
 
 (defconstant ordinal-tens 
   #(nil "tenth" "twentieth" "thirtieth" "fortieth"
 	"fiftieth" "sixtieth" "seventieth" "eightieth" "ninetieth")
-  _N"Table of ordinal tens-place digits in English")
+  "Table of ordinal tens-place digits in English")
 
 (defun format-print-small-cardinal (stream n)
   (multiple-value-bind 
diff --git a/code/fwrappers.lisp b/code/fwrappers.lisp
index 8d713a2e2c3ae66faeff552755e0e3cde01d12c8..606d316f2741862bb3b1742a33c83a7721000bd7 100644
--- a/code/fwrappers.lisp
+++ b/code/fwrappers.lisp
@@ -27,7 +27,7 @@
 ;;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 ;;; DAMAGE.
 
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fwrappers.lisp,v 1.6 2010/03/19 15:18:59 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fwrappers.lisp,v 1.7 2010/04/19 02:18:03 rtoy Exp $")
 
 (in-package :fwrappers)
 
@@ -51,14 +51,14 @@
   (user-data	nil		:type t))
 
 (defun print-fwrapper (fwrapper stream depth)
-  _N"Print-function for struct FWRAPPER."
+  "Print-function for struct FWRAPPER."
   (declare (ignore depth))
   (print-unreadable-object (fwrapper stream :type t :identity t)
     (format stream "~s" (fwrapper-type fwrapper))))
 
 (declaim (inline fwrapper-or-nil))
 (defun fwrapper-or-nil (fun)
-  _N"Return FUN if it is an fwrapper or nil if it isn't."
+  "Return FUN if it is an fwrapper or nil if it isn't."
   (and (functionp fun)
        ;; Necessary for cold-load reasons.
        (= (get-type fun) vm:funcallable-instance-header-type)
@@ -66,7 +66,7 @@
        fun))
 
 (defmacro do-fwrappers ((var fdefn &optional result) &body body)
-  _N"Evaluate BODY with VAR bound to consecutive fwrappers of
+  "Evaluate BODY with VAR bound to consecutive fwrappers of
    FDEFN.  Return RESULT at the end."
   `(loop for ,var = (fwrapper-or-nil (fdefn-function ,fdefn))
 	 then (fwrapper-or-nil (fwrapper-next ,var))
@@ -75,13 +75,13 @@
 
 (declaim (inline last-fwrapper))
 (defun last-fwrapper (fdefn)
-  _N"Return tha last encapsulation of FDEFN or NIL if none."
+  "Return tha last encapsulation of FDEFN or NIL if none."
   (do-fwrappers (f fdefn)
     (when (null (fwrapper-or-nil (fwrapper-next f)))
       (return f))))
 
 (defun push-fwrapper (f function-name)
-  _N"Prepend encapsulation F to the definition of FUNCTION-NAME.
+  "Prepend encapsulation F to the definition of FUNCTION-NAME.
    Signal an error if FUNCTION-NAME is an undefined function."
   (declare (type fwrapper f))
   (let ((fdefn (fdefn-or-lose function-name)))
@@ -89,19 +89,19 @@
     (setf (fdefn-function fdefn) f)))
 
 (defun delete-fwrapper (f function-name)
-  _N"Remove fwrapper F from the definition of FUNCTION-NAME."
+  "Remove fwrapper F from the definition of FUNCTION-NAME."
   (set-fwrappers function-name
 		 (delete f (list-fwrappers function-name))))
 
 (defun list-fwrappers (function-name)
-  _N"Return a list of all fwrappers of FUNCTION-NAME, ordered
+  "Return a list of all fwrappers of FUNCTION-NAME, ordered
    from outermost to innermost."
   (collect ((result))
     (do-fwrappers (f (fdefn-or-lose function-name) (result))
       (result f))))
 
 (defun set-fwrappers (function-name fwrappers)
-  _N"Set FUNCTION-NAMES's fwrappers to elements of the list
+  "Set FUNCTION-NAMES's fwrappers to elements of the list
    FWRAPPERS, which is assumed to be ordered from outermost to
    innermost.  FWRAPPERS null means remove all fwrappers."
   (let ((fdefn (fdefn-or-lose function-name))
@@ -111,7 +111,7 @@
       (push-fwrapper f function-name))))
 
 (defun fwrap (function-name constructor &key type user-data)
-  _N"Wrap the function named FUNCTION-NAME in an fwrapper of type TYPE,
+  "Wrap the function named FUNCTION-NAME in an fwrapper of type TYPE,
    created by calling CONSTRUCTOR.  CONSTRUCTOR is a function
    defined with DEFINE-FWRAPPER, or the name of such a function.
    Return the fwrapper created.  USER-DATA is arbitrary data to be
@@ -123,7 +123,7 @@
     (push-fwrapper f function-name)))
 
 (defun funwrap (function-name &key (type nil type-p) test)
-  _N"Remove fwrappers from the function named FUNCTION-NAME.
+  "Remove fwrappers from the function named FUNCTION-NAME.
    If TYPE is supplied, remove fwrappers whose type is equal to TYPE.
    If TEST is supplied, remove fwrappers satisfying TEST.
    If both are not specified, remove all fwrappers."
@@ -136,13 +136,13 @@
       (set-fwrappers function-name (new)))))
 
 (defun update-fwrapper (f)
-  _N"Update the funcallable instance function of fwrapper F from its
+  "Update the funcallable instance function of fwrapper F from its
    constructor."
   (setf (kernel:funcallable-instance-function f)
 	(funcall (fwrapper-constructor f) f)))
 
 (defun update-fwrappers (function-name &key (type nil type-p) test)
-  _N"Update fwrapper function definitions of FUNCTION-NAME.
+  "Update fwrapper function definitions of FUNCTION-NAME.
    If TYPE is supplied, update fwrappers whose type is equal to TYPE.
    If TEST is supplied, update fwrappers satisfying TEST."
   (do-fwrappers (f (fdefn-or-lose function-name))
@@ -151,7 +151,7 @@
 	(update-fwrapper f)))))
 
 (defun find-fwrapper (function-name &key (type nil type-p) test)
-  _N"Find an fwrapper of FUNCTION-NAME.
+  "Find an fwrapper of FUNCTION-NAME.
    If TYPE is supplied, find an fwrapper whose type is equal to TYPE.
    If TEST is supplied, find an fwrapper satisfying TEST."
   (do-fwrappers (f (fdefn-or-lose function-name))
@@ -160,7 +160,7 @@
 	(return f)))))
 
 (defmacro define-fwrapper (name lambda-list &body body &environment env)
-  _N"Like DEFUN, but define a function wrapper.
+  "Like DEFUN, but define a function wrapper.
    In BODY, the symbol FWRAPPERS:FWRAPPERS refers to the currently
    executing fwrapper.  FWRAPPERS:CALL-NEXT-FUNCTION can be used
    in BODY to call the next fwrapper or the primary function.  When
@@ -171,7 +171,7 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun expand-define-fwrapper (name lambda-list body env)
-    _N"Return the expansion of a DEFINE-FWRAPPER."
+    "Return the expansion of a DEFINE-FWRAPPER."
     (multiple-value-bind (required optional restp rest keyp keys allowp
 				   aux morep)
 	(kernel:parse-lambda-list lambda-list)
@@ -217,7 +217,7 @@
 		     ,@body))))))))
 
   (defun uses-vars-p (body optionals keys rest env)
-    _N"First value is true if BODY refers to any of the variables in
+    "First value is true if BODY refers to any of the variables in
      OPTIONALS, KEYS or REST, which are what KERNEL:PARSE-LAMBDA-LIST
      returns.  Second value is true if BODY refers to REST."
     (collect ((vars))
@@ -251,22 +251,22 @@
 ;;;
 
 (define-fwrapper encapsulation-fwrapper (&rest args)
-  _N"Fwrapper for old-style encapsulations."
+  "Fwrapper for old-style encapsulations."
   (let ((basic-definition (fwrapper-next fwrapper))
 	(argument-list args))
     (declare (special basic-definition argument-list))
     (eval (fwrapper-user-data fwrapper))))
 
 (defun encapsulate (name type body)
-  _N"This function is deprecated; use fwrappers instead."
+  "This function is deprecated; use fwrappers instead."
   (fwrap name #'encapsulation-fwrapper :type type :user-data body))
 
 (defun unencapsulate (name type)
-  _N"This function is deprecated; use fwrappers instead."
+  "This function is deprecated; use fwrappers instead."
   (funwrap name :type type))
 
 (defun encapsulated-p (name type)
-  _N"This function is deprecated; use fwrappers instead."
+  "This function is deprecated; use fwrappers instead."
   (not (null (find-fwrapper name :type type))))
 
 ;;; end of file
diff --git a/code/gc.lisp b/code/gc.lisp
index f52a3af7b054921f9b9d8c8b88cf853fe8fa0dc5..c311d1eb79b5e406a598c40313563d61d8534ca9 100644
--- a/code/gc.lisp
+++ b/code/gc.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/gc.lisp,v 1.43 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/gc.lisp,v 1.44 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -143,7 +143,7 @@
 
 
 (defun room (&optional (verbosity :default))
-  _N"Prints to *STANDARD-OUTPUT* information about the state of internal
+  "Prints to *STANDARD-OUTPUT* information about the state of internal
   storage and its management.  The optional argument controls the
   verbosity of ROOM.  If it is T, ROOM prints out a maximal amount of
   information.  If it is NIL, ROOM prints out a minimal amount of
@@ -223,7 +223,7 @@
   *total-bytes-consed*)
 
 (defun get-bytes-consed ()
-  _N"Returns the number of bytes consed since the first time this function
+  "Returns the number of bytes consed since the first time this function
   was called.  The first time it is called, it returns zero."
   (dfixnum:dfixnum-integer (get-bytes-consed-dfixnum)))
     
@@ -239,14 +239,14 @@
 ;;; will be triggered.
 ;;; 
 (defparameter *bytes-consed-between-gcs* default-bytes-consed-between-gcs
-  _N"This number specifies the minimum number of bytes of dynamic space
+  "This number specifies the minimum number of bytes of dynamic space
    that must be consed before the next gc will occur.")
 ;;;
 (declaim (type index *bytes-consed-between-gcs*))
 
 ;;; Public
 (defvar *gc-run-time* 0
-  _N"The total CPU time spend doing garbage collection (as reported by
+  "The total CPU time spend doing garbage collection (as reported by
    GET-INTERNAL-RUN-TIME.)")
 
 (declaim (type index *gc-run-time*))
@@ -304,11 +304,11 @@
 ;;; after garbage collection occurs.
 ;;;
 (defvar *before-gc-hooks* nil
-  _N"A list of functions that are called before garbage collection occurs.
+  "A list of functions that are called before garbage collection occurs.
   The functions should take no arguments.")
 ;;; 
 (defvar *after-gc-hooks* nil
-  _N"A list of functions that are called after garbage collection occurs.
+  "A list of functions that are called after garbage collection occurs.
   The functions should take no arguments.")
 
 ;;;
@@ -321,7 +321,7 @@
 ;;; Presumably someone will call GC-ON later to collect the garbage.
 ;;;
 (defvar *gc-inhibit-hook* nil
-  _N"Should be bound to a function or NIL.  If it is a function, this
+  "Should be bound to a function or NIL.  If it is a function, this
   function should take one argument, the current amount of dynamic
   usage.  The function should return NIL if garbage collection should
   continue and non-NIL if it should be inhibited.  Use with caution.")
@@ -332,7 +332,7 @@
 ;;; *GC-VERBOSE*
 ;;;
 (defvar *gc-verbose* t
-  _N"When non-NIL, causes the functions bound to *GC-NOTIFY-BEFORE* and
+  "When non-NIL, causes the functions bound to *GC-NOTIFY-BEFORE* and
   *GC-NOTIFY-AFTER* to be called before and after a garbage collection
   occurs respectively.  If :BEEP, causes the default notify functions to beep
   annoyingly.")
@@ -346,7 +346,7 @@
   (finish-output))
 ;;;
 (defparameter *gc-notify-before* #'default-gc-notify-before
-  _N"This function bound to this variable is invoked before GC'ing (unless
+  "This function bound to this variable is invoked before GC'ing (unless
   *GC-VERBOSE* is NIL) with the current amount of dynamic usage (in
   bytes).  It should notify the user that the system is going to GC.")
 
@@ -360,7 +360,7 @@
   (finish-output))
 ;;;
 (defparameter *gc-notify-after* #'default-gc-notify-after
-  _N"The function bound to this variable is invoked after GC'ing (unless
+  "The function bound to this variable is invoked after GC'ing (unless
   *GC-VERBOSE* is NIL) with the amount of dynamic usage (in bytes) now
   free, the number of bytes freed by the GC, and the new GC trigger
   threshold.  The function should notify the user that the system has
@@ -526,7 +526,7 @@
 ;;;; Auxiliary Functions.
 
 (defun bytes-consed-between-gcs ()
-  _N"Return the amount of memory that will be allocated before the next garbage
+  "Return the amount of memory that will be allocated before the next garbage
    collection is initiated.  This can be set with SETF."
   *bytes-consed-between-gcs*)
 ;;;
@@ -548,14 +548,14 @@
 
 
 (defun gc-on ()
-  _N"Enables the garbage collector."
+  "Enables the garbage collector."
   (setq *gc-inhibit* nil)
   (when *need-to-collect-garbage*
     (sub-gc))
   nil)
 
 (defun gc-off ()
-  _N"Disables the garbage collector."
+  "Disables the garbage collector."
   (setq *gc-inhibit* t)
   nil)
 
@@ -584,7 +584,7 @@
     (min-av-mem-age c-call:double)))
 
 (defun gencgc-stats (generation)
-  _N"Return some GC statistics for the specified GENERATION.  The
+  "Return some GC statistics for the specified GENERATION.  The
   statistics are the number of bytes allocated in this generation; the
   gc-trigger; the number of bytes consed between GCs; the number of
   GCs that have occurred; the trigger age; the cumulative number of
diff --git a/code/hash-new.lisp b/code/hash-new.lisp
index 01be25c636eb9adcfa27d7061b6c196743533464..c5f8f4725e7e3bfadb19c2011aabed849f212068 100644
--- a/code/hash-new.lisp
+++ b/code/hash-new.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/hash-new.lisp,v 1.52 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/hash-new.lisp,v 1.53 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -173,7 +173,7 @@
 
 (defun almost-primify (num)
   (declare (type index num))
-  _N"Almost-Primify returns an almost prime number greater than or equal
+  "Almost-Primify returns an almost prime number greater than or equal
    to NUM."
   (if (= (rem num 2) 0)
       (setq num (+ 1 num)))
@@ -194,7 +194,7 @@
 ;;; DEFINE-HASH-TABLE-TEST -- Public.
 ;;;
 (defun define-hash-table-test (name test-fun hash-fun)
-  _N"Define a new kind of hash table test."
+  "Define a new kind of hash table test."
   (declare (type symbol name)
 	   (type function test-fun hash-fun))
   (setf *hash-table-tests*
@@ -209,7 +209,7 @@
 ;;; 
 (defun make-hash-table (&key (test 'eql) (size 65) (rehash-size 1.5)
 			     (rehash-threshold 1.0) (weak-p nil))
-  _N"Creates and returns a new hash table.  The keywords are as follows:
+  "Creates and returns a new hash table.  The keywords are as follows:
      :TEST -- Indicates what kind of test to use.  Only EQ, EQL, EQUAL,
        and EQUALP are currently supported.
      :SIZE -- A hint as to how many elements will be put in this hash
@@ -320,7 +320,7 @@
 
 (declaim (inline hash-table-count))
 (defun hash-table-count (hash-table)
-  _N"Returns the number of entries in the given HASH-TABLE."
+  "Returns the number of entries in the given HASH-TABLE."
   (declare (type hash-table hash-table)
 	   (values index))
   (hash-table-number-entries hash-table))
@@ -333,7 +333,7 @@
 
 (declaim (inline hash-table-size))
 (defun hash-table-size (hash-table)
-  _N"Return a size that can be used with MAKE-HASH-TABLE to create a hash
+  "Return a size that can be used with MAKE-HASH-TABLE to create a hash
    table that can hold however many entries HASH-TABLE can hold without
    having to be grown."
   (hash-table-rehash-trigger hash-table))
@@ -530,7 +530,7 @@
 ;;; GETHASH -- Public.
 ;;; 
 (defun gethash (key hash-table &optional default)
-  _N"Finds the entry in HASH-TABLE whose key is KEY and returns the associated
+  "Finds the entry in HASH-TABLE whose key is KEY and returns the associated
    value and T as multiple values, or returns DEFAULT and NIL if there is no
    such entry.  Entries can be added using SETF."
   (declare (type hash-table hash-table)
@@ -657,7 +657,7 @@
 ;;; REMHASH -- public.
 ;;; 
 (defun remhash (key hash-table)
-  _N"Remove the entry in HASH-TABLE associated with KEY.  Returns T if there
+  "Remove the entry in HASH-TABLE associated with KEY.  Returns T if there
    was such an entry, and NIL if not."
   (declare (type hash-table hash-table)
 	   (values (member t nil)))
@@ -752,7 +752,7 @@
 ;;; CLRHASH -- public.
 ;;; 
 (defun clrhash (hash-table)
-  _N"This removes all the entries from HASH-TABLE and returns the hash table
+  "This removes all the entries from HASH-TABLE and returns the hash table
    itself."
   (let* ((kv-vector (hash-table-table hash-table))
 	 (kv-length (length kv-vector))
@@ -790,7 +790,7 @@
 ;;; CLOBBER-HASH -- public.
 ;;; 
 (defun clobber-hash (hash-table)
-  _N"This removes all the entries from HASH-TABLE and returns the hash table
+  "This removes all the entries from HASH-TABLE and returns the hash table
    itself, shrinking the size to free memory."
   (let* ((old-kv-vector (hash-table-table hash-table))
 	 (old-index-vector (hash-table-index-vector hash-table))
@@ -838,7 +838,7 @@
 
 (declaim (maybe-inline maphash))
 (defun maphash (map-function hash-table)
-  _N"For each entry in HASH-TABLE, calls MAP-FUNCTION on the key and value
+  "For each entry in HASH-TABLE, calls MAP-FUNCTION on the key and value
    of the entry; returns NIL."
   (declare (type (or function symbol) map-function)
 	   (type hash-table hash-table))
@@ -862,7 +862,7 @@
 	  (funcall fun key value))))))
 
 (defmacro with-hash-table-iterator ((function hash-table) &body body)
-  _N"WITH-HASH-TABLE-ITERATOR ((function hash-table) &body body)
+  "WITH-HASH-TABLE-ITERATOR ((function hash-table) &body body)
    provides a method of manually looping over the elements of a hash-table.
    FUNCTION is bound to a generator-macro that, within the scope of the
    invocation, returns one or three values. The first value tells whether
@@ -1061,7 +1061,7 @@
     (t 42)))
 
 (defun sxhash (s-expr)
-  _N"Computes a hash code for S-EXPR and returns it as an integer."
+  "Computes a hash code for S-EXPR and returns it as an integer."
   (internal-sxhash s-expr 0))
 
 
diff --git a/code/internet.lisp b/code/internet.lisp
index 93f630571c3f71091bb43680ec186dbaec84f7ed..d7d5df15376d3b55c105f650eebaa3e0e5116ef7 100644
--- a/code/internet.lisp
+++ b/code/internet.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/internet.lisp,v 1.58 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/internet.lisp,v 1.59 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -86,7 +86,7 @@
 (defvar *internet-protocols*
   '((:stream    6 #.sock-stream)
     (:datagram 17 #.sock-dgram))
-  _N"AList of socket kinds and protocol values.")
+  "AList of socket kinds and protocol values.")
 
 (defun internet-protocol (kind)
   (when (eq kind :data-gram) ; Sep-2000. Remove someday.
@@ -207,7 +207,7 @@ struct in_addr {
 (def-alien-routine ("os_get_h_errno" get-h-errno) int)
 
 (defun lookup-host-entry (host)
-  _N"Return a host-entry for the given host. The host may be an address
+  "Return a host-entry for the given host. The host may be an address
   string or an IP address in host order."
   (declare (type (or host-entry string (unsigned-byte 32)) host)
 	   (optimize (inhibit-warnings 3)))
@@ -347,7 +347,7 @@ struct in_addr {
       (values connected (slot sockaddr 'path)))))
 
 (defun bind-inet-socket (socket host port)
-  _N"bind Socket to (local) Host and Port"
+  "bind Socket to (local) Host and Port"
   (let ((addr (if (stringp host)
 		  (host-entry-addr (or (lookup-host-entry host)
 				       (error _"Unknown host: ~S." host)))
@@ -380,7 +380,7 @@ struct in_addr {
 
 (defun connect-to-inet-socket (host port &optional (kind :stream)
 			       &key local-host local-port)
-  _N"The host may be an address string or an IP address in host order."
+  "The host may be an address string or an IP address in host order."
   (let* ((addr (if (stringp host)
 		   (host-entry-addr (or (lookup-host-entry host)
 					(error _"Unknown host: ~S." host)))
@@ -442,7 +442,7 @@ struct in_addr {
 ;; cause errno set to the real reason for the failure.
 
 (defun connect-to-inet-socket/non-blocking (host port &optional (kind :stream))
-  _N"The host may be an address string or an IP address in host order."
+  "The host may be an address string or an IP address in host order."
    (let ((addr (if (stringp host)
                  (host-entry-addr (or (lookup-host-entry host)
                                       (error _"Unknown host: ~S." host)))
@@ -511,7 +511,7 @@ struct in_addr {
 (defconstant so-reuseaddr #+linux 2 #+(or solaris bsd hpux irix) 4)
 
 (defun get-socket-option (socket level optname)
-  _N"Get an integer value socket option."
+  "Get an integer value socket option."
   (declare (type unix:unix-fd socket)
 	   (type (signed-byte 32) level optname))
   (with-alien ((optval signed))
@@ -521,7 +521,7 @@ struct in_addr {
 	(values optval 0))))
 
 (defun set-socket-option (socket level optname optval)
-  _N"Set an integer value socket option."
+  "Set an integer value socket option."
   (declare (type unix:unix-fd socket)
 	   (type (signed-byte 32) level optname optval))
   (with-alien ((optval signed optval))
@@ -602,7 +602,7 @@ struct in_addr {
   (undefined-value))
 
 (defun get-peer-host-and-port (fd)
-  _N"Return the peer host address and port in host order."
+  "Return the peer host address and port in host order."
   (with-alien ((sockaddr inet-sockaddr)
 	       (length (alien:array unsigned 1)))
     (setf (deref length 0) (alien-size inet-sockaddr :bytes))
@@ -679,7 +679,7 @@ struct in_addr {
 ;;; will be delivered.)
 
 (defun add-oob-handler (fd char handler)
-  _N"Arrange to funcall HANDLER when CHAR shows up out-of-band on FD."
+  "Arrange to funcall HANDLER when CHAR shows up out-of-band on FD."
   (declare (integer fd)
 	   (base-char char))
   (let ((handlers (assoc fd *oob-handlers*)))
@@ -706,7 +706,7 @@ struct in_addr {
 ;;; descriptor.
 
 (defun remove-oob-handler (fd char)
-  _N"Remove any handlers for CHAR on FD."
+  "Remove any handlers for CHAR on FD."
   (declare (integer fd)
 	   (base-char char))
   (let ((handlers (assoc fd *oob-handlers*)))
@@ -729,7 +729,7 @@ struct in_addr {
 ;;;   Delete the entry for the given file descriptor.
 
 (defun remove-all-oob-handlers (fd)
-  _N"Remove all handlers for FD."
+  "Remove all handlers for FD."
   (declare (integer fd))
   (setf *oob-handlers*
 	(delete fd *oob-handlers*
@@ -753,7 +753,7 @@ struct in_addr {
 	     (unix:get-unix-error-msg)))))
 
 (defun inet-recvfrom (fd buffer size &key (flags 0))
-  _N"A packaging of the unix recvfrom call.  Returns three values:
+  "A packaging of the unix recvfrom call.  Returns three values:
 bytecount, source address as integer, and source port.  bytecount
 can of course be negative, to indicate faults."
   #+mp (mp:process-wait-until-fd-usable fd :input)
@@ -764,7 +764,7 @@ can of course be negative, to indicate faults."
       (values bytecount (ntohl (slot sockaddr 'addr)) (ntohs (slot sockaddr 'port))))))
 
 (defun inet-sendto (fd buffer size addr port &key (flags 0))
-  _N"A packaging of the unix sendto call.  Return value like sendto"
+  "A packaging of the unix sendto call.  Return value like sendto"
     (with-alien ((sockaddr inet-sockaddr))
       (setf (slot sockaddr 'family) af-inet)
       (setf (slot sockaddr 'port) (htons port))
@@ -781,7 +781,7 @@ can of course be negative, to indicate faults."
 (defconstant shut-rdwr 2)
 
 (defun inet-shutdown (fd level)
-  _N"A packaging of the unix shutdown call.  An error is signaled if shutdown fails." 
+  "A packaging of the unix shutdown call.  An error is signaled if shutdown fails." 
   (when (minusp (unix:unix-shutdown fd level))
     (error 'socket-error
 	   :format-control _"Error on shutdown of socket: ~A"
@@ -794,7 +794,7 @@ can of course be negative, to indicate faults."
 ;;;   Returns a stream connected to the specified Port on the given Host.
 (defun open-network-stream (host port &key (buffering :line) timeout
 					   (external-format '(:latin-1 :crlf)))
-  _N"Return a network stream.  HOST may be an address string or an integer
+  "Return a network stream.  HOST may be an address string or an integer
 IP address."
   (let (hostent hostaddr)
     (cond ((stringp host)
diff --git a/code/interr.lisp b/code/interr.lisp
index 67b9e0f0dfacba5bd90b9fa2ac6dc6021443fadf..d349416f59626c321832ab65e9d8be151725de16 100644
--- a/code/interr.lisp
+++ b/code/interr.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.48 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.49 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -528,9 +528,9 @@
 ;;; Track the depth of recursive errors.
 ;;;
 (defvar *maximum-error-depth* 10
-  _N"The maximum number of nested errors allowed.  Internal errors are
+  "The maximum number of nested errors allowed.  Internal errors are
    double-counted.")
-(defvar *current-error-depth* 0 _N"The current number of nested errors.")
+(defvar *current-error-depth* 0 "The current number of nested errors.")
 
 ;;; These specials are used by ERROR-ERROR to track the success of recovery
 ;;; attempts.
diff --git a/code/irrat.lisp b/code/irrat.lisp
index 3b0bac4881672030ce8ebfcfa984d6ad59ffa4e5..a87f05f12939b79f7ef751e2af11034d44b2e718 100644
--- a/code/irrat.lisp
+++ b/code/irrat.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/irrat.lisp,v 1.61 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/irrat.lisp,v 1.62 2010/04/19 02:18:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -293,7 +293,7 @@
 ;;;; Power functions.
 
 (defun exp (number)
-  _N"Return e raised to the power NUMBER."
+  "Return e raised to the power NUMBER."
   (number-dispatch ((number number))
     (handle-reals %exp number)
     ((complex)
@@ -360,7 +360,7 @@
 ;;; the complex-real and real-complex cases from the general complex case.
 ;;;
 (defun expt (base power)
-  _N"Returns BASE raised to the POWER."
+  "Returns BASE raised to the POWER."
   (if (zerop power)
       ;; CLHS says that if the power is 0, the result is 1, subject to
       ;; numeric contagion.  But what happens if base is infinity or
@@ -676,7 +676,7 @@
 	 (+ n frac))))))
 
 (defun log (number &optional (base nil base-p))
-  _N"Return the logarithm of NUMBER in the base BASE, which defaults to e."
+  "Return the logarithm of NUMBER in the base BASE, which defaults to e."
   (if base-p
       (cond ((zerop base)
 	     ;; ANSI spec
@@ -804,7 +804,7 @@
 	 (complex-log number)))))
 
 (defun sqrt (number)
-  _N"Return the square root of NUMBER."
+  "Return the square root of NUMBER."
   (number-dispatch ((number number))
     (((foreach fixnum bignum ratio))
      (if (minusp number)
@@ -829,7 +829,7 @@
 ;;;; Trigonometic and Related Functions
 
 (defun abs (number)
-  _N"Returns the absolute value of the number."
+  "Returns the absolute value of the number."
   (number-dispatch ((number number))
     (((foreach single-float double-float fixnum rational
 	       #+double-double double-double-float))
@@ -853,7 +853,7 @@
 	    (scale-float (sqrt abs^2) scale))))))))
 
 (defun phase (number)
-  _N"Returns the angle part of the polar representation of a complex number.
+  "Returns the angle part of the polar representation of a complex number.
   For complex numbers, this is (atan (imagpart number) (realpart number)).
   For non-complex positive numbers, this is 0.  For non-complex negative
   numbers this is PI."
@@ -880,7 +880,7 @@
 
 
 (defun sin (number)  
-  _N"Return the sine of NUMBER."
+  "Return the sine of NUMBER."
   (number-dispatch ((number number))
     (handle-reals %sin number)
     ((complex)
@@ -890,7 +890,7 @@
 		(* (cos x) (sinh y)))))))
 
 (defun cos (number)
-  _N"Return the cosine of NUMBER."
+  "Return the cosine of NUMBER."
   (number-dispatch ((number number))
     (handle-reals %cos number)
     ((complex)
@@ -900,20 +900,20 @@
 		(- (* (sin x) (sinh y))))))))
 
 (defun tan (number)
-  _N"Return the tangent of NUMBER."
+  "Return the tangent of NUMBER."
   (number-dispatch ((number number))
     (handle-reals %tan number)
     ((complex)
      (complex-tan number))))
 
 (defun cis (theta)
-  _N"Return cos(Theta) + i sin(Theta), AKA exp(i Theta)."
+  "Return cos(Theta) + i sin(Theta), AKA exp(i Theta)."
   (if (complexp theta)
       (error _"Argument to CIS is complex: ~S" theta)
       (complex (cos theta) (sin theta))))
 
 (defun asin (number)
-  _N"Return the arc sine of NUMBER."
+  "Return the arc sine of NUMBER."
   (number-dispatch ((number number))
     ((rational)
      (if (or (> number 1) (< number -1))
@@ -937,7 +937,7 @@
      (complex-asin number))))
 
 (defun acos (number)
-  _N"Return the arc cosine of NUMBER."
+  "Return the arc cosine of NUMBER."
   (number-dispatch ((number number))
     ((rational)
      (if (or (> number 1) (< number -1))
@@ -962,7 +962,7 @@
 
 
 (defun atan (y &optional (x nil xp))
-  _N"Return the arc tangent of Y if X is omitted or Y/X if X is supplied."
+  "Return the arc tangent of Y if X is omitted or Y/X if X is supplied."
   (if xp
       (flet ((atan2 (y x)
 	       (declare (type double-float y x)
@@ -1000,7 +1000,7 @@
 	 (complex-atan y)))))
 
 (defun sinh (number)
-  _N"Return the hyperbolic sine of NUMBER."
+  "Return the hyperbolic sine of NUMBER."
   (number-dispatch ((number number))
     (handle-reals %sinh number)
     ((complex)
@@ -1010,7 +1010,7 @@
 		(* (cosh x) (sin y)))))))
 
 (defun cosh (number)
-  _N"Return the hyperbolic cosine of NUMBER."
+  "Return the hyperbolic cosine of NUMBER."
   (number-dispatch ((number number))
     (handle-reals %cosh number)
     ((complex)
@@ -1020,21 +1020,21 @@
 		(* (sinh x) (sin y)))))))
 
 (defun tanh (number)
-  _N"Return the hyperbolic tangent of NUMBER."
+  "Return the hyperbolic tangent of NUMBER."
   (number-dispatch ((number number))
     (handle-reals %tanh number)
     ((complex)
      (complex-tanh number))))
 
 (defun asinh (number)
-  _N"Return the hyperbolic arc sine of NUMBER."
+  "Return the hyperbolic arc sine of NUMBER."
   (number-dispatch ((number number))
     (handle-reals %asinh number)
     ((complex)
      (complex-asinh number))))
 
 (defun acosh (number)
-  _N"Return the hyperbolic arc cosine of NUMBER."
+  "Return the hyperbolic arc cosine of NUMBER."
   (number-dispatch ((number number))
     ((rational)
      ;; acosh is complex if number < 1
@@ -1055,7 +1055,7 @@
      (complex-acosh number))))
 
 (defun atanh (number)
-  _N"Return the hyperbolic arc tangent of NUMBER."
+  "Return the hyperbolic arc tangent of NUMBER."
   (number-dispatch ((number number))
     ((rational)
      ;; atanh is complex if |number| > 1
@@ -1152,7 +1152,7 @@
 
 (declaim (inline scalb))
 (defun scalb (x n)
-  _N"Compute 2^N * X without compute 2^N first (use properties of the
+  "Compute 2^N * X without compute 2^N first (use properties of the
 underlying floating-point format"
   (declare (type float x)
 	   (type double-float-exponent n))
@@ -1160,7 +1160,7 @@ underlying floating-point format"
 
 (declaim (inline logb-finite))
 (defun logb-finite (x)
-  _N"Same as logb but X is not infinity and non-zero and not a NaN, so
+  "Same as logb but X is not infinity and non-zero and not a NaN, so
 that we can always return an integer"
   (declare (type float x))
   (multiple-value-bind (signif expon sign)
@@ -1171,7 +1171,7 @@ that we can always return an integer"
     (1- expon)))
       
 (defun logb (x)
-  _N"Compute an integer N such that 1 <= |2^(-N) * x| < 2.
+  "Compute an integer N such that 1 <= |2^(-N) * x| < 2.
 For the special cases, the following values are used:
 
     x             logb
@@ -1199,7 +1199,7 @@ For the special cases, the following values are used:
 
 (declaim (inline coerce-to-complex-type))
 (defun coerce-to-complex-type (x y z)
-  _N"Create complex number with real part X and imaginary part Y such that
+  "Create complex number with real part X and imaginary part Y such that
 it has the same type as Z.  If Z has type (complex rational), the X
 and Y are coerced to single-float."
   (declare (double-float x y)
@@ -1250,7 +1250,7 @@ and Y are coerced to single-float."
 	       (values rho 0)))))))
 
 (defun complex-sqrt (z)
-  _N"Principle square root of Z
+  "Principle square root of Z
 
 Z may be any number, but the result is always a complex."
   (declare (number z))
@@ -1295,7 +1295,7 @@ Z may be any number, but the result is always a complex."
 	(coerce-to-complex-type eta nu z)))))
 
 (defun complex-log-scaled (z j)
-  _N"Compute log(2^j*z).
+  "Compute log(2^j*z).
 
 This is for use with J /= 0 only when |z| is huge."
   (declare (number z)
@@ -1330,7 +1330,7 @@ This is for use with J /= 0 only when |z| is huge."
 				z)))))
 
 (defun complex-log (z)
-  _N"Log of Z = log |Z| + i * arg Z
+  "Log of Z = log |Z| + i * arg Z
 
 Z may be any number, but the result is always a complex."
   (declare (number z))
@@ -1345,7 +1345,7 @@ Z may be any number, but the result is always a complex."
 ;; never 0 since we have positive and negative zeroes.
 
 (defun complex-atanh (z)
-  _N"Compute atanh z = (log(1+z) - log(1-z))/2"
+  "Compute atanh z = (log(1+z) - log(1-z))/2"
   (declare (number z))
   #+double-double
   (when (typep z '(or double-double-float (complex double-double-float)))
@@ -1409,7 +1409,7 @@ Z may be any number, but the result is always a complex."
 				  z)))))
 
 (defun complex-tanh (z)
-  _N"Compute tanh z = sinh z / cosh z"
+  "Compute tanh z = sinh z / cosh z"
   (declare (number z))
   #+double-double
   (when (typep z '(or double-double-float (complex double-double-float)))
@@ -1494,7 +1494,7 @@ Z may be any number, but the result is always a complex."
   (complex (+ (realpart z) 1) (imagpart z)))
 
 (defun complex-acos (z)
-  _N"Compute acos z = pi/2 - asin z
+  "Compute acos z = pi/2 - asin z
 
 Z may be any number, but the result is always a complex."
   (declare (number z))
@@ -1513,7 +1513,7 @@ Z may be any number, but the result is always a complex."
 				       sqrt-1-z))))))))
 
 (defun complex-acosh (z)
-  _N"Compute acosh z = 2 * log(sqrt((z+1)/2) + sqrt((z-1)/2))
+  "Compute acosh z = 2 * log(sqrt((z+1)/2) + sqrt((z-1)/2))
 
 Z may be any number, but the result is always a complex."
   (declare (number z))
@@ -1527,7 +1527,7 @@ Z may be any number, but the result is always a complex."
 
 
 (defun complex-asin (z)
-  _N"Compute asin z = asinh(i*z)/i
+  "Compute asin z = asinh(i*z)/i
 
 Z may be any number, but the result is always a complex."
   (declare (number z))
@@ -1546,7 +1546,7 @@ Z may be any number, but the result is always a complex."
 				       sqrt-1+z))))))))
 
 (defun complex-asinh (z)
-  _N"Compute asinh z = log(z + sqrt(1 + z*z))
+  "Compute asinh z = log(z + sqrt(1 + z*z))
 
 Z may be any number, but the result is always a complex."
   (declare (number z))
@@ -1560,7 +1560,7 @@ Z may be any number, but the result is always a complex."
 	     (- (realpart result)))))
 	 
 (defun complex-atan (z)
-  _N"Compute atan z = atanh (i*z) / i
+  "Compute atan z = atanh (i*z) / i
 
 Z may be any number, but the result is always a complex."
   (declare (number z))
@@ -1574,7 +1574,7 @@ Z may be any number, but the result is always a complex."
 	     (- (realpart result)))))
 
 (defun complex-tan (z)
-  _N"Compute tan z = -i * tanh(i * z)
+  "Compute tan z = -i * tanh(i * z)
 
 Z may be any number, but the result is always a complex."
   (declare (number z))
diff --git a/code/kernel.lisp b/code/kernel.lisp
index db38e4130c7d2b5b70e08f7792854947a5b53ca9..d1f5af4d0bd70125108e2fd1b3a2d85df3838cb7 100644
--- a/code/kernel.lisp
+++ b/code/kernel.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/kernel.lisp,v 1.17 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/kernel.lisp,v 1.18 2010/04/19 02:18:03 rtoy Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -18,107 +18,107 @@
 
 
 (defun get-header-data (x)
-  _N"Return the 24 bits of data in the header of object X, which must be an
+  "Return the 24 bits of data in the header of object X, which must be an
   other-pointer object."
   (get-header-data x))
 
 (defun set-header-data (x val)
-  _N"Sets the 24 bits of data in the header of object X (which must be an
+  "Sets the 24 bits of data in the header of object X (which must be an
   other-pointer object) to VAL."
   (set-header-data x val))
 
 (defun get-closure-length (x)
-  _N"Returns the length of the closure X.  This is one more than the number
+  "Returns the length of the closure X.  This is one more than the number
   of variables closed over."
   (get-closure-length x))
 
 (defun get-lowtag (x)
-  _N"Returns the three-bit lowtag for the object X."
+  "Returns the three-bit lowtag for the object X."
   (get-lowtag x))
 
 (defun get-type (x)
-  _N"Returns the 8-bit header type for the object X."
+  "Returns the 8-bit header type for the object X."
   (get-type x))
 
 (defun vector-sap (x)
-  _N"Return a System-Area-Pointer pointing to the data for the vector X, which
+  "Return a System-Area-Pointer pointing to the data for the vector X, which
   must be simple."
   (declare (type (simple-unboxed-array (*)) x))
   (vector-sap x))
 
 
 (defun c::binding-stack-pointer-sap ()
-  _N"Return a System-Area-Pointer pointing to the end of the binding stack."
+  "Return a System-Area-Pointer pointing to the end of the binding stack."
   (c::binding-stack-pointer-sap))
 
 (defun c::dynamic-space-free-pointer ()
-  _N"Returns a System-Area-Pointer pointing to the next free work of the current
+  "Returns a System-Area-Pointer pointing to the next free work of the current
   dynamic space."
   (c::dynamic-space-free-pointer))
 
 (defun c::control-stack-pointer-sap ()
-  _N"Return a System-Area-Pointer pointing to the end of the control stack."
+  "Return a System-Area-Pointer pointing to the end of the control stack."
   (c::control-stack-pointer-sap))
 
 (defun function-subtype (function)
-  _N"Return the header typecode for FUNCTION.  Can be set with SETF."
+  "Return the header typecode for FUNCTION.  Can be set with SETF."
   (function-subtype function))
 
 (defun (setf function-subtype) (type function)
   (setf (function-subtype function) type))
 
 (defun %function-arglist (func)
-  _N"Extracts the arglist from the function header FUNC."
+  "Extracts the arglist from the function header FUNC."
   (%function-arglist func))
 
 (defun %function-name (func)
-  _N"Extracts the name from the function header FUNC."
+  "Extracts the name from the function header FUNC."
   (%function-name func))
 
 (defun %function-type (func)
-  _N"Extracts the type from the function header FUNC."
+  "Extracts the type from the function header FUNC."
   (%function-type func))
 
 (defun %closure-function (closure)
-  _N"Extracts the function from CLOSURE."
+  "Extracts the function from CLOSURE."
   (%closure-function closure))
 
 (defun c::vector-length (vector)
-  _N"Return the length of VECTOR.  There is no reason to use this, 'cause
+  "Return the length of VECTOR.  There is no reason to use this, 'cause
   (length (the vector foo)) is the same."
   (c::vector-length vector))
 
 (defun %sxhash-simple-string (string)
-  _N"Return the SXHASH for the simple-string STRING."
+  "Return the SXHASH for the simple-string STRING."
   (%sxhash-simple-string string))
 
 (defun %sxhash-simple-substring (string length)
-  _N"Return the SXHASH for the first LENGTH characters of the simple-string
+  "Return the SXHASH for the first LENGTH characters of the simple-string
   STRING."
   (%sxhash-simple-substring string length))
 
 (defun %closure-index-ref (closure index)
-  _N"Extract the INDEXth slot from CLOSURE."
+  "Extract the INDEXth slot from CLOSURE."
   (%closure-index-ref closure index))
 
 
 (defun allocate-vector (type length words)
-  _N"Allocate a unboxed, simple vector with type code TYPE, length LENGTH, and
+  "Allocate a unboxed, simple vector with type code TYPE, length LENGTH, and
   WORDS words long.  Note: it is your responsibility to assure that the
   relation between LENGTH and WORDS is correct."
   (allocate-vector type length words))
 
 (defun make-array-header (type rank)
-  _N"Allocate an array header with type code TYPE and rank RANK."
+  "Allocate an array header with type code TYPE and rank RANK."
   (make-array-header type rank))
 
 
 (defun code-instructions (code-obj)
-  _N"Return a SAP pointing to the instructions part of CODE-OBJ."
+  "Return a SAP pointing to the instructions part of CODE-OBJ."
   (code-instructions code-obj))
 
 (defun code-header-ref (code-obj index)
-  _N"Extract the INDEXth element from the header of CODE-OBJ.  Can be set with
+  "Extract the INDEXth element from the header of CODE-OBJ.  Can be set with
   setf."
   (code-header-ref code-obj index))
 
diff --git a/code/linux-os.lisp b/code/linux-os.lisp
index 29095ce20e60addb294b84bbfd42db042134398b..fd18f47db714c2feaf67720ddaadf6a7ba987752 100644
--- a/code/linux-os.lisp
+++ b/code/linux-os.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/linux-os.lisp,v 1.9 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/linux-os.lisp,v 1.10 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -32,7 +32,7 @@
 ;;; select() in Linux kernel 2.6.x) and instead of running uname -r,
 ;;; let's just get the info from uname().
 (defun software-version ()
-  _N"Returns a string describing version of the supporting software."
+  "Returns a string describing version of the supporting software."
   (multiple-value-bind (sysname nodename release version)
       (unix:unix-uname)
     (declare (ignore sysname nodename))
diff --git a/code/lispinit.lisp b/code/lispinit.lisp
index d0e742bd1227148cf2d5216f112961e76067f8d7..af736e819425a75fa081b928b2cc0e1a2de717d3 100644
--- a/code/lispinit.lisp
+++ b/code/lispinit.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/lispinit.lisp,v 1.80 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/lispinit.lisp,v 1.81 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -21,7 +21,7 @@
 	  ++ +++ ** *** // ///))
 
 (defvar *features* '(:common :common-lisp :ansi-cl :ieee-floating-point :cmu)
-  _N"Holds a list of symbols that describe features provided by the
+  "Holds a list of symbols that describe features provided by the
    implementation.")
 
 
@@ -29,7 +29,7 @@
 (export '(compiler-version scrub-control-stack *runtime-features*))
 
 (defvar *runtime-features* nil
-  _N"Features affecting the runtime")
+  "Features affecting the runtime")
 
 (in-package :extensions)
 (export '(quit *prompt*))
@@ -48,10 +48,10 @@
 ;;; Make the error system enable interrupts.
 
 (defconstant most-positive-fixnum #.vm:target-most-positive-fixnum
-  _N"The fixnum closest in value to positive infinity.")
+  "The fixnum closest in value to positive infinity.")
 
 (defconstant most-negative-fixnum #.vm:target-most-negative-fixnum
-  _N"The fixnum closest in value to negative infinity.")
+  "The fixnum closest in value to negative infinity.")
 
 
 ;;; Random information:
@@ -142,11 +142,11 @@
 (in-package "CONDITIONS")
 
 (defvar *break-on-signals* nil
-  _N"When (typep condition *break-on-signals*) is true, then calls to SIGNAL will
+  "When (typep condition *break-on-signals*) is true, then calls to SIGNAL will
    enter the debugger prior to signalling that condition.")
 
 (defun signal (datum &rest arguments)
-  _N"Invokes the signal facility on a condition formed from datum and arguments.
+  "Invokes the signal facility on a condition formed from datum and arguments.
    If the condition is not handled, nil is returned.  If
    (TYPEP condition *BREAK-ON-SIGNALS*) is true, the debugger is invoked before
    any signalling is done."
@@ -195,7 +195,7 @@
 		:format-arguments (list function-name datum)))))
 
 (defun error (datum &rest arguments)
-  _N"Invokes the signal facility on a condition formed from datum and arguments.
+  "Invokes the signal facility on a condition formed from datum and arguments.
    If the condition is not handled, the debugger is invoked."
   (kernel:infinite-error-protect
     (let ((condition (coerce-to-condition datum arguments
@@ -241,7 +241,7 @@
   nil)
 
 (defun break (&optional (datum "Break") &rest arguments)
-  _N"Prints a message and invokes the debugger without allowing any possibility
+  "Prints a message and invokes the debugger without allowing any possibility
    of condition handling occurring."
   (kernel:infinite-error-protect
     (with-simple-restart (continue _"Return from BREAK.")
@@ -253,7 +253,7 @@
   nil)
 
 (defun warn (datum &rest arguments)
-  _N"Warns about a situation by signalling a condition formed by datum and
+  "Warns about a situation by signalling a condition formed by datum and
    arguments.  While the condition is being signaled, a muffle-warning restart
    exists that causes WARN to immediately return nil."
   (kernel:infinite-error-protect
@@ -271,7 +271,7 @@
 ;;; Utility functions
 
 (defun simple-program-error (datum &rest arguments)
-  _N"Invokes the signal facility on a condition formed from datum and arguments.
+  "Invokes the signal facility on a condition formed from datum and arguments.
    If the condition is not handled, the debugger is invoked.  This function
    is just like error, except that the condition type defaults to the type
    simple-program-error, instead of program-error."
@@ -327,7 +327,7 @@
     str))
 
 (defun %initial-function ()
-  _N"Gives the world a shove and hopes it spins."
+  "Gives the world a shove and hopes it spins."
   (%primitive print "In initial-function, and running.")
   #-gengc (setf *already-maybe-gcing* t)
   #-gengc (setf *gc-inhibit* t)
@@ -484,12 +484,12 @@
 ;;;; Miscellaneous external functions:
 
 (defvar *cleanup-functions* nil
-  _N"Functions to be invoked during cleanup at Lisp exit.")
+  "Functions to be invoked during cleanup at Lisp exit.")
 
 ;;; Quit gets us out, one way or another.
 
 (defun quit (&optional recklessly-p)
-  _N"Terminates the current Lisp.  Things are cleaned up unless Recklessly-P is
+  "Terminates the current Lisp.  Things are cleaned up unless Recklessly-P is
   non-Nil."
   (if recklessly-p
       (unix:unix-exit 0)
@@ -572,7 +572,7 @@
 ;;; demand stacks the stack must be decreased as it is scrubbed.
 ;;;
 (defun scrub-control-stack ()
-  _N"Zero the unused portion of the control stack so that old objects are not
+  "Zero the unused portion of the control stack so that old objects are not
    kept alive because of uninitialized stack variables."
   ;;
   ;; The guard zone of the control stack is used by Lisp sometimes,
@@ -589,25 +589,25 @@
 ;;;; TOP-LEVEL loop.
 
 (defvar / nil
-  _N"Holds a list of all the values returned by the most recent top-level EVAL.")
-(defvar // nil _N"Gets the previous value of / when a new value is computed.")
-(defvar /// nil _N"Gets the previous value of // when a new value is computed.")
-(defvar * nil _N"Holds the value of the most recent top-level EVAL.")
-(defvar ** nil _N"Gets the previous value of * when a new value is computed.")
-(defvar *** nil _N"Gets the previous value of ** when a new value is computed.")
-(defvar + nil _N"Holds the value of the most recent top-level READ.")
-(defvar ++ nil _N"Gets the previous value of + when a new value is read.")
-(defvar +++ nil _N"Gets the previous value of ++ when a new value is read.")
-(defvar - nil _N"Holds the form curently being evaluated.")
+  "Holds a list of all the values returned by the most recent top-level EVAL.")
+(defvar // nil "Gets the previous value of / when a new value is computed.")
+(defvar /// nil "Gets the previous value of // when a new value is computed.")
+(defvar * nil "Holds the value of the most recent top-level EVAL.")
+(defvar ** nil "Gets the previous value of * when a new value is computed.")
+(defvar *** nil "Gets the previous value of ** when a new value is computed.")
+(defvar + nil "Holds the value of the most recent top-level READ.")
+(defvar ++ nil "Gets the previous value of + when a new value is read.")
+(defvar +++ nil "Gets the previous value of ++ when a new value is read.")
+(defvar - nil "Holds the form curently being evaluated.")
 (defvar *prompt* "* "
-  _N"The top-level prompt string.  This also may be a function of no arguments
+  "The top-level prompt string.  This also may be a function of no arguments
    that returns a simple-string.")
 (defvar *in-top-level-catcher* nil
-  _N"True if we are within the Top-Level-Catcher.  This is used by interrupt
+  "True if we are within the Top-Level-Catcher.  This is used by interrupt
   handlers to see whether it is o.k. to throw.")
 
 (defun interactive-eval (form)
-  _N"Evaluate FORM, returning whatever it returns but adjust ***, **, *, +++, ++,
+  "Evaluate FORM, returning whatever it returns but adjust ***, **, *, +++, ++,
   +, ///, //, /, and -."
   (when (and (fboundp 'commandp) (funcall 'commandp form))
     (return-from interactive-eval (funcall 'invoke-command-interactive form)))
@@ -634,14 +634,14 @@
 (defconstant eofs-before-quit 10)
 
 (defparameter *reserved-heap-pages* 256
-  _N"How many pages to reserve from the total heap space so we can handle
+  "How many pages to reserve from the total heap space so we can handle
 heap overflow.")
 
 #+heap-overflow-check
 (alien:def-alien-variable "reserved_heap_pages" c-call:unsigned-long)
 
 (defun %top-level ()
-  _N"Top-level READ-EVAL-PRINT loop.  Do not call this."
+  "Top-level READ-EVAL-PRINT loop.  Do not call this."
   (let  ((* nil) (** nil) (*** nil)
 	 (- nil) (+ nil) (++ nil) (+++ nil)
 	 (/// nil) (// nil) (/ nil)
diff --git a/code/list.lisp b/code/list.lisp
index 55e86480109326f091b07a337e8b46c3ff52734d..be02e3a5addb1108476db9fad1b8905d1092d5ba 100644
--- a/code/list.lisp
+++ b/code/list.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/list.lisp,v 1.38 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/list.lisp,v 1.39 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -59,37 +59,37 @@
 
 ;;; These functions perform basic list operations:
 
-(defun car (list) _N"Returns the 1st object in a list." (car list))
-(defun cdr (list) _N"Returns all but the first object." (cdr list))
-(defun cadr (list) _N"Returns the 2nd object in a list." (cadr list))
-(defun cdar (list) _N"Returns the cdr of the 1st sublist." (cdar list))
-(defun caar (list) _N"Returns the car of the 1st sublist." (caar list))
-(defun cddr (list) _N"Returns all but the 1st two objects of a list." (cddr list))
-(defun caddr (list) _N"Returns the 1st object in the cddr of a list." (caddr list))
-(defun caadr (list) _N"Returns the 1st object in the cadr of a list." (caadr list))
-(defun caaar (list) _N"Returns the 1st object in the caar of a list." (caaar list))
-(defun cdaar (list) _N"Returns the cdr of the caar of a list." (cdaar list))
-(defun cddar (list) _N"Returns the cdr of the cdar of a list." (cddar list))
-(defun cdddr (list) _N"Returns the cdr of the cddr of a list." (cdddr list))
-(defun cadar (list) _N"Returns the car of the cdar of a list." (cadar list))
-(defun cdadr (list) _N"Returns the cdr of the cadr of a list." (cdadr list))
-(defun caaaar (list) _N"Returns the car of the caaar of a list." (caaaar list))
-(defun caaadr (list) _N"Returns the car of the caadr of a list." (caaadr list))
-(defun caaddr (list) _N"Returns the car of the caddr of a list." (caaddr list))
-(defun cadddr (list) _N"Returns the car of the cdddr of a list." (cadddr list))
-(defun cddddr (list) _N"Returns the cdr of the cdddr of a list." (cddddr list))
-(defun cdaaar (list) _N"Returns the cdr of the caaar of a list." (cdaaar list))
-(defun cddaar (list) _N"Returns the cdr of the cdaar of a list." (cddaar list))
-(defun cdddar (list) _N"Returns the cdr of the cddar of a list." (cdddar list))
-(defun caadar (list) _N"Returns the car of the cadar of a list." (caadar list))
-(defun cadaar (list) _N"Returns the car of the cdaar of a list." (cadaar list))
-(defun cadadr (list) _N"Returns the car of the cdadr of a list." (cadadr list))
-(defun caddar (list) _N"Returns the car of the cddar of a list." (caddar list))
-(defun cdaadr (list) _N"Returns the cdr of the caadr of a list." (cdaadr list))
-(defun cdadar (list) _N"Returns the cdr of the cadar of a list." (cdadar list))
-(defun cdaddr (list) _N"Returns the cdr of the caddr of a list." (cdaddr list))
-(defun cddadr (list) _N"Returns the cdr of the cdadr of a list." (cddadr list))
-(defun cons (se1 se2) _N"Returns a list with se1 as the car and se2 as the cdr."
+(defun car (list) "Returns the 1st object in a list." (car list))
+(defun cdr (list) "Returns all but the first object." (cdr list))
+(defun cadr (list) "Returns the 2nd object in a list." (cadr list))
+(defun cdar (list) "Returns the cdr of the 1st sublist." (cdar list))
+(defun caar (list) "Returns the car of the 1st sublist." (caar list))
+(defun cddr (list) "Returns all but the 1st two objects of a list." (cddr list))
+(defun caddr (list) "Returns the 1st object in the cddr of a list." (caddr list))
+(defun caadr (list) "Returns the 1st object in the cadr of a list." (caadr list))
+(defun caaar (list) "Returns the 1st object in the caar of a list." (caaar list))
+(defun cdaar (list) "Returns the cdr of the caar of a list." (cdaar list))
+(defun cddar (list) "Returns the cdr of the cdar of a list." (cddar list))
+(defun cdddr (list) "Returns the cdr of the cddr of a list." (cdddr list))
+(defun cadar (list) "Returns the car of the cdar of a list." (cadar list))
+(defun cdadr (list) "Returns the cdr of the cadr of a list." (cdadr list))
+(defun caaaar (list) "Returns the car of the caaar of a list." (caaaar list))
+(defun caaadr (list) "Returns the car of the caadr of a list." (caaadr list))
+(defun caaddr (list) "Returns the car of the caddr of a list." (caaddr list))
+(defun cadddr (list) "Returns the car of the cdddr of a list." (cadddr list))
+(defun cddddr (list) "Returns the cdr of the cdddr of a list." (cddddr list))
+(defun cdaaar (list) "Returns the cdr of the caaar of a list." (cdaaar list))
+(defun cddaar (list) "Returns the cdr of the cdaar of a list." (cddaar list))
+(defun cdddar (list) "Returns the cdr of the cddar of a list." (cdddar list))
+(defun caadar (list) "Returns the car of the cadar of a list." (caadar list))
+(defun cadaar (list) "Returns the car of the cdaar of a list." (cadaar list))
+(defun cadadr (list) "Returns the car of the cdadr of a list." (cadadr list))
+(defun caddar (list) "Returns the car of the cddar of a list." (caddar list))
+(defun cdaadr (list) "Returns the cdr of the caadr of a list." (cdaadr list))
+(defun cdadar (list) "Returns the cdr of the cadar of a list." (cdadar list))
+(defun cdaddr (list) "Returns the cdr of the caddr of a list." (cdaddr list))
+(defun cddadr (list) "Returns the cdr of the cdadr of a list." (cddadr list))
+(defun cons (se1 se2) "Returns a list with se1 as the car and se2 as the cdr."
                       (cons se1 se2))
 
 
@@ -114,19 +114,19 @@
 	(t ())))
 
 (defun tree-equal (x y &key (test #'eql) test-not)
-  _N"Returns T if X and Y are isomorphic trees with identical leaves."
+  "Returns T if X and Y are isomorphic trees with identical leaves."
   (if test-not
       (tree-equal-test-not x y test-not)
       (tree-equal-test x y test)))
 
 
 (defun endp (object)
-  _N"The recommended way to test for the end of a list.  True if Object is nil,
+  "The recommended way to test for the end of a list.  True if Object is nil,
    false if Object is a cons, and an error for any other types of arguments."
   (endp object))
 
 (defun list-length (list)
-  _N"Returns the length of the given List, or Nil if the List is circular."
+  "Returns the length of the given List, or Nil if the List is circular."
   (do ((n 0 (+ n 2))
        (y list (cddr y))
        (z list (cdr z)))
@@ -137,45 +137,45 @@
     (when (and (eq y z) (> n 0)) (return nil))))
 
 (defun nth (n list)
-  _N"Returns the nth object in a list where the car is the zero-th element."
+  "Returns the nth object in a list where the car is the zero-th element."
   (car (nthcdr n list)))
 
 (defun first (list)
-  _N"Returns the 1st object in a list or NIL if the list is empty."
+  "Returns the 1st object in a list or NIL if the list is empty."
   (car list))
 (defun second (list)
-  _N"Returns the 2nd object in a list or NIL if there is no 2nd object."
+  "Returns the 2nd object in a list or NIL if there is no 2nd object."
   (cadr list))
 (defun third (list)
-  _N"Returns the 3rd object in a list or NIL if there is no 3rd object."
+  "Returns the 3rd object in a list or NIL if there is no 3rd object."
   (caddr list))
 (defun fourth (list)
-  _N"Returns the 4th object in a list or NIL if there is no 4th object."
+  "Returns the 4th object in a list or NIL if there is no 4th object."
   (cadddr list))
 (defun fifth (list)
-  _N"Returns the 5th object in a list or NIL if there is no 5th object."
+  "Returns the 5th object in a list or NIL if there is no 5th object."
   (car (cddddr list)))
 (defun sixth (list)
-  _N"Returns the 6th object in a list or NIL if there is no 6th object."
+  "Returns the 6th object in a list or NIL if there is no 6th object."
   (cadr (cddddr list)))
 (defun seventh (list)
-  _N"Returns the 7th object in a list or NIL if there is no 7th object."
+  "Returns the 7th object in a list or NIL if there is no 7th object."
   (caddr (cddddr list)))
 (defun eighth (list)
-  _N"Returns the 8th object in a list or NIL if there is no 8th object."
+  "Returns the 8th object in a list or NIL if there is no 8th object."
   (cadddr (cddddr list)))
 (defun ninth (list)
-  _N"Returns the 9th object in a list or NIL if there is no 9th object."
+  "Returns the 9th object in a list or NIL if there is no 9th object."
   (car (cddddr (cddddr list))))
 (defun tenth (list)
-  _N"Returns the 10th object in a list or NIL if there is no 10th object."
+  "Returns the 10th object in a list or NIL if there is no 10th object."
   (cadr (cddddr (cddddr list))))
 (defun rest (list)
-  _N"Means the same as the cdr of a list."
+  "Means the same as the cdr of a list."
   (cdr list))
 
 (defun nthcdr (n list)
-  _N"Performs the cdr function n times on a list."
+  "Performs the cdr function n times on a list."
   (flet ((fast-nthcdr (n list)
            (declare (type index n))
            (do ((i n (1- i))
@@ -192,7 +192,7 @@
            (declare (type index i)))))))
 
 (defun last (list &optional (n 1))
-  _N"Returns the last N conses (not the last element!) of a list."
+  "Returns the last N conses (not the last element!) of a list."
   (declare (type unsigned-byte n))
   (if (typep n 'index)
       (do ((checked-list list (cdr checked-list))
@@ -205,14 +205,14 @@
       list))
 
 (defun list (&rest args)
-  _N"Returns constructs and returns a list of its arguments."
+  "Returns constructs and returns a list of its arguments."
   args)
 
 ;;; List* is done the same as list, except that the last cons is made a
 ;;; dotted pair
 
 (defun list* (arg &rest others)
-  _N"Returns a list of the arguments with last cons a dotted pair"
+  "Returns a list of the arguments with last cons a dotted pair"
   (cond ((atom others) arg)
 	((atom (cdr others)) (cons arg (car others)))
 	(t (do ((x others (cdr x)))
@@ -220,7 +220,7 @@
 	   (cons arg others))))
 
 (defun make-list (size &key initial-element)
-  _N"Constructs a list with size elements each set to value"
+  "Constructs a list with size elements each set to value"
   (declare (type index size))
   (do ((count size (1- count))
        (result '() (cons initial-element result)))
@@ -258,7 +258,7 @@
 ;;; using splice which cdr's down the end of the new list
 
 (defun append (&rest args)
-  _N"Typically, returns a new list that is the concatenation of Args.
+  "Typically, returns a new list that is the concatenation of Args.
 
   Each Arg in Args must be a proper list except the last one, which
   may be any object.  The function is not destructive: for all but the
@@ -309,7 +309,7 @@
 ;;; of the new list
 
 (defun copy-list (list)
-  _N"Returns a new list EQUAL but not EQ to list"
+  "Returns a new list EQUAL but not EQ to list"
   (if (atom list)
       list
       (let ((result (list (car list))))
@@ -322,7 +322,7 @@
 	result)))
 
 (defun copy-alist (alist)
-  _N"Returns a new association list equal to alist, constructed in space"
+  "Returns a new association list equal to alist, constructed in space"
   (if (atom alist)
       alist
       (let ((result
@@ -344,7 +344,7 @@
 	result)))
 
 (defun copy-tree (object)
-  _N"Copy-Tree recursively copys trees of conses."
+  "Copy-Tree recursively copys trees of conses."
   (if (consp object)
       (cons (copy-tree (car object)) (copy-tree (cdr object)))
       object))
@@ -353,7 +353,7 @@
 ;;; More Commonly-used List Functions
 
 (defun revappend (x y)
-  _N"Returns (append (reverse x) y)"
+  "Returns (append (reverse x) y)"
   (do ((top x (cdr top))
        (result y (cons (car top) result)))
       ((endp top) result)))
@@ -370,7 +370,7 @@
 ;;; argument to be circular.
 ;;;
 (defun nconc (&rest lists)
-  _N"Concatenates the lists given as arguments (by changing them)"
+  "Concatenates the lists given as arguments (by changing them)"
   (do ((top lists (cdr top)))
       ((null top) nil)
     (let ((top-of-top (car top)))
@@ -398,7 +398,7 @@
 	(t (error _"Argument is not a list -- ~S." top-of-top))))))
 
 (defun nreconc (x y)
-  _N"Returns (nconc (nreverse x) y)"
+  "Returns (nconc (nreverse x) y)"
   (do ((1st (cdr x) (if (atom 1st) 1st (cdr 1st)))
        (2nd x 1st)		;2nd follows first down the list.
        (3rd y 2nd))		;3rd follows 2nd down the list.
@@ -417,7 +417,7 @@
     (rplacd 2nd 3rd)))
 
 (defun butlast (list &optional (n 1))
-  _N"Returns a new list the same as List without the last N conses.
+  "Returns a new list the same as List without the last N conses.
    List must not be circular."
   (declare (list list) (type unsigned-byte n))
   (when (and list (typep n 'index))
@@ -435,7 +435,7 @@
 	  (setq splice (cdr (rplacd splice (list (car top))))))))))
 
 (defun nbutlast (list &optional (n 1))
-  _N"Modifies List to remove the last N conses. List must not be circular."
+  "Modifies List to remove the last N conses. List must not be circular."
   (declare (list list) (type unsigned-byte n))
   (when (and list (typep n 'index))
     (let ((length (do ((list list (cdr list))
@@ -452,7 +452,7 @@
 	  (declare (type index count)))))))
 
 (defun ldiff (list object)
-  _N"Returns a new list, whose elements are those of List that appear before
+  "Returns a new list, whose elements are those of List that appear before
    Object.  If Object is not a tail of List, a copy of List is returned.
    List must be a proper list or a dotted list."
   (do* ((list list (cdr list))
@@ -469,11 +469,11 @@
 ;;; Functions to alter list structure
 
 (defun rplaca (x y)
-  _N"Changes the car of x to y and returns the new x."
+  "Changes the car of x to y and returns the new x."
   (rplaca x y))
 
 (defun rplacd (x y)
-  _N"Changes the cdr of x to y and returns the new x."
+  "Changes the cdr of x to y and returns the new x."
   (rplacd x y))
 
 ;;; The following are for use by SETF.
@@ -484,7 +484,7 @@
 
 (defun %setnth (n list newval)
   (declare (type index n))
-  _N"Sets the Nth element of List (zero based) to Newval."
+  "Sets the Nth element of List (zero based) to Newval."
   (do ((count n (1- count))
        (list list (cdr list)))
       ((endp list)
@@ -507,12 +507,12 @@
        ,element))
 
 (defun identity (thing)
-  _N"Returns what was passed to it."
+  "Returns what was passed to it."
   thing)
 
 
 (defun complement (function)
-  _N"Builds a new function that returns T whenever FUNCTION returns NIL and
+  "Builds a new function that returns T whenever FUNCTION returns NIL and
    NIL whenever FUNCTION returns T."
   #'(lambda (&optional (arg0 nil arg0-p) (arg1 nil arg1-p) (arg2 nil arg2-p)
 		       &rest more-args)
@@ -525,7 +525,7 @@
 
 (defun constantly (value &optional (val1 nil val1-p) (val2 nil val2-p)
 			 &rest more-values)
-  _N"Builds a function that always returns VALUE, and posisbly MORE-VALUES."
+  "Builds a function that always returns VALUE, and posisbly MORE-VALUES."
   (cond (more-values
 	 (let ((list (list* value val1 val2 more-values)))
 	   #'(lambda ()
@@ -566,7 +566,7 @@
 
 
 (defun subst (new old tree &key key (test #'eql testp) (test-not nil notp))
-  _N"Substitutes new for subtrees matching old."
+  "Substitutes new for subtrees matching old."
   (labels ((s (subtree)
 	      (cond ((satisfies-the-test old subtree) new)
 		    ((atom subtree) subtree)
@@ -579,7 +579,7 @@
     (s tree)))
 
 (defun subst-if (new test tree &key key)
-  _N"Substitutes new for subtrees for which test is true."
+  "Substitutes new for subtrees for which test is true."
   (labels ((s (subtree)
 	      (cond ((funcall test (apply-key key subtree)) new)
 		    ((atom subtree) subtree)
@@ -592,7 +592,7 @@
     (s tree)))
 
 (defun subst-if-not (new test tree &key key)
-  _N"Substitutes new for subtrees for which test is false."
+  "Substitutes new for subtrees for which test is false."
   (labels ((s (subtree)
 	      (cond ((not (funcall test (apply-key key subtree))) new)
 		    ((atom subtree) subtree)
@@ -605,7 +605,7 @@
     (s tree)))
 
 (defun nsubst (new old tree &key key (test #'eql testp) (test-not nil notp))
-  _N"Substitutes new for subtrees matching old."
+  "Substitutes new for subtrees matching old."
   (labels ((s (subtree)
 	      (cond ((satisfies-the-test old subtree) new)
 		    ((atom subtree) subtree)
@@ -621,7 +621,7 @@
     (s tree)))
 
 (defun nsubst-if (new test tree &key key)
-  _N"Substitutes new for subtrees of tree for which test is true."
+  "Substitutes new for subtrees of tree for which test is true."
   (labels ((s (subtree)
 	      (cond ((funcall test (apply-key key subtree)) new)
 		    ((atom subtree) subtree)
@@ -637,7 +637,7 @@
     (s tree)))
 
 (defun nsubst-if-not (new test tree &key key)
-  _N"Substitutes new for subtrees of tree for which test is false."
+  "Substitutes new for subtrees of tree for which test is false."
   (labels ((s (subtree)
 	      (cond ((not (funcall test (apply-key key subtree))) new)
 		    ((atom subtree) subtree)
@@ -656,7 +656,7 @@
 
 
 (defun sublis (alist tree &key key (test #'eql) (test-not nil notp))
-  _N"Substitutes from alist into tree nondestructively."
+  "Substitutes from alist into tree nondestructively."
   (declare (inline assoc))
   (labels ((s (subtree)
 	     (let* ((key-val (apply-key key subtree))
@@ -682,7 +682,7 @@
 	  (assoc ,key-tmp alist :test test)))))
 
 (defun nsublis (alist tree &key key (test #'eql) (test-not nil notp))
-  _N"Substitutes new for subtrees matching old."
+  "Substitutes new for subtrees matching old."
   (declare (inline assoc))
   (let (temp)
     (labels ((s (subtree)
@@ -704,7 +704,7 @@
 ;;;; Functions for using lists as sets
 
 (defun member (item list &key key (test #'eql testp) (test-not nil notp))
-  _N"Returns tail of list beginning with first element satisfying EQLity,
+  "Returns tail of list beginning with first element satisfying EQLity,
    :test, or :test-not with a given item."
   (do ((list list (cdr list)))
       ((null list) nil)
@@ -713,21 +713,21 @@
 	  (return list)))))
 
 (defun member-if (test list &key key)
-  _N"Returns tail of list beginning with first element satisfying test(element)"
+  "Returns tail of list beginning with first element satisfying test(element)"
   (do ((list list (Cdr list)))
       ((endp list) nil)
     (if (funcall test (apply-key key (car list)))
 	(return list))))
 
 (defun member-if-not (test list &key key)
-  _N"Returns tail of list beginning with first element not satisfying test(el)"
+  "Returns tail of list beginning with first element not satisfying test(el)"
   (do ((list list (cdr list)))
       ((endp list) ())
     (if (not (funcall test (apply-key key (car list))))
 	(return list))))
 
 (defun tailp (object list)
-  _N"Returns true if Object is the same as some tail of List, otherwise
+  "Returns true if Object is the same as some tail of List, otherwise
    returns false. List must be a proper list or a dotted list."
   (do ((list list (cdr list)))
       ((atom list) (eql list object))
@@ -735,7 +735,7 @@
 	(return t))))
 
 (defun adjoin (item list &key key (test #'eql) (test-not nil notp))
-  _N"Add item to list unless it is already a member"
+  "Add item to list unless it is already a member"
   (declare (inline member))
   (if (let ((key-val (apply-key key item)))
 	(if notp
@@ -753,7 +753,7 @@
 ;;; order.
 ;;;
 (defun union (list1 list2 &key key (test #'eql testp) (test-not nil notp))
-  _N"Returns the union of list1 and list2."
+  "Returns the union of list1 and list2."
   (declare (inline member))
   (when (and testp notp) (error _"Test and test-not both supplied."))
   (let ((res list2))
@@ -772,7 +772,7 @@
 	   ,destination temp)))
 
 (defun nunion (list1 list2 &key key (test #'eql testp) (test-not nil notp))
-  _N"Destructively returns the union list1 and list2."
+  "Destructively returns the union list1 and list2."
   (declare (inline member))
   (if (and testp notp)
       (error "Test and test-not both supplied."))
@@ -788,7 +788,7 @@
 
 (defun intersection (list1 list2 &key key
 			   (test #'eql testp) (test-not nil notp))
-  _N"Returns the intersection of list1 and list2."
+  "Returns the intersection of list1 and list2."
   (declare (inline member))
   (if (and testp notp)
       (error "Test and test-not both supplied."))
@@ -800,7 +800,7 @@
 
 (defun nintersection (list1 list2 &key key
 			    (test #'eql testp) (test-not nil notp))
-  _N"Destructively returns the intersection of list1 and list2."
+  "Destructively returns the intersection of list1 and list2."
   (declare (inline member))
   (if (and testp notp)
       (error "Test and test-not both supplied."))
@@ -814,7 +814,7 @@
 
 (defun set-difference (list1 list2 &key key
 			     (test #'eql testp) (test-not nil notp))
-  _N"Returns the elements of list1 which are not in list2."
+  "Returns the elements of list1 which are not in list2."
   (declare (inline member))
   (if (and testp notp)
       (error "Test and test-not both supplied."))
@@ -829,7 +829,7 @@
 
 (defun nset-difference (list1 list2 &key key
 			      (test #'eql testp) (test-not nil notp))
-  _N"Destructively returns the elements of list1 which are not in list2."
+  "Destructively returns the elements of list1 which are not in list2."
   (declare (inline member))
   (if (and testp notp)
       (error "Test and test-not both supplied."))
@@ -844,7 +844,7 @@
 
 (defun set-exclusive-or (list1 list2 &key key
                          (test #'eql testp) (test-not nil notp))
-  _N"Return new list of elements appearing exactly once in LIST1 and LIST2."
+  "Return new list of elements appearing exactly once in LIST1 and LIST2."
   (declare (inline member))
   (let ((result nil)
         (key (when key (coerce key 'function)))
@@ -876,7 +876,7 @@
 
 (defun nset-exclusive-or (list1 list2
 				&key key (test #'eql testp) (test-not #'eql notp))
-  _N"Destructively return a list with elements which appear but once in LIST1
+  "Destructively return a list with elements which appear but once in LIST1
    and LIST2."
   (when (and testp notp)
     (error ":TEST and :TEST-NOT were both supplied."))
@@ -929,7 +929,7 @@
 	  (setq splicex x)))))
 
 (defun subsetp (list1 list2 &key key (test #'eql testp) (test-not nil notp))
-  _N"Returns T if every element in list1 is also in list2."
+  "Returns T if every element in list1 is also in list2."
   (declare (inline member))
   (dolist (elt list1)
     (unless (with-set-keys (member (apply-key key elt) list2))
@@ -941,11 +941,11 @@
 ;;; Functions that operate on association lists
 
 (defun acons (key datum alist)
-  _N"Construct a new alist by adding the pair (key . datum) to alist"
+  "Construct a new alist by adding the pair (key . datum) to alist"
   (cons (cons key datum) alist))
 
 (defun pairlis (keys data &optional (alist '()))
-  _N"Construct an association list from keys and data (adding to alist)"
+  "Construct an association list from keys and data (adding to alist)"
   (do ((x keys (cdr x))
        (y data (cdr y)))
       ((and (endp x) (endp y)) alist)
@@ -962,7 +962,7 @@
 	 (if ,test-guy (return (car alist))))))
 
 (defun assoc (item alist &key key test test-not)
-  _N"Returns the cons in alist whose car is equal (by a given test or EQL) to
+  "Returns the cons in alist whose car is equal (by a given test or EQL) to
    the Item."
   (cond (test
 	 (if key
@@ -979,14 +979,14 @@
 	     (assoc-guts (eql item (caar alist)))))))
 
 (defun assoc-if (predicate alist &key key)
-  _N"Returns the first cons in alist whose car satisfies the Predicate.  If
+  "Returns the first cons in alist whose car satisfies the Predicate.  If
    key is supplied, apply it to the car of each cons before testing."
   (if key
       (assoc-guts (funcall predicate (funcall key (caar alist))))
       (assoc-guts (funcall predicate (caar alist)))))
 
 (defun assoc-if-not (predicate alist &key key)
-  _N"Returns the first cons in alist whose car does not satisfiy the Predicate.
+  "Returns the first cons in alist whose car does not satisfiy the Predicate.
   If key is supplied, apply it to the car of each cons before testing."
   (if key
       (assoc-guts (not (funcall predicate (funcall key (caar alist)))))
@@ -995,7 +995,7 @@
 
 (defun rassoc (item alist &key key test test-not)
   (declare (list alist))
-  _N"Returns the cons in alist whose cdr is equal (by a given test or EQL) to
+  "Returns the cons in alist whose cdr is equal (by a given test or EQL) to
    the Item."
   (cond (test
 	 (if key
@@ -1012,14 +1012,14 @@
 	     (assoc-guts (eql item (cdar alist)))))))
 
 (defun rassoc-if (predicate alist &key key)
-  _N"Returns the first cons in alist whose cdr satisfies the Predicate.  If key
+  "Returns the first cons in alist whose cdr satisfies the Predicate.  If key
   is supplied, apply it to the cdr of each cons before testing."
   (if key
       (assoc-guts (funcall predicate (funcall key (cdar alist))))
       (assoc-guts (funcall predicate (cdar alist)))))
 
 (defun rassoc-if-not (predicate alist &key key)
-  _N"Returns the first cons in alist whose cdr does not satisfy the Predicate.
+  "Returns the first cons in alist whose cdr does not satisfy the Predicate.
   If key is supplied, apply it to the cdr of each cons before testing."
   (if key
       (assoc-guts (not (funcall predicate (funcall key (cdar alist)))))
@@ -1030,7 +1030,7 @@
 ;;;; Mapping functions.
 
 (defun map1 (function original-arglists accumulate take-car)
-  _N"This function is called by mapc, mapcar, mapcan, mapl, maplist, and mapcon.
+  "This function is called by mapc, mapcar, mapcan, mapl, maplist, and mapcon.
   It Maps function over the arglists in the appropriate way. It is done when any
   of the arglists runs out.  Until then, it CDRs down the arglists calling the
   function and accumulating results as desired."
@@ -1056,45 +1056,45 @@
 
 
 (defun mapc (function list &rest more-lists)
-  _N"Applies fn to successive elements of lists, returns its second argument."
+  "Applies fn to successive elements of lists, returns its second argument."
   (map1 function (cons list more-lists) nil t))
 
 (defun mapcar (function list &rest more-lists)
-  _N"Applies fn to successive elements of list, returns list of results."
+  "Applies fn to successive elements of list, returns list of results."
   (map1 function (cons list more-lists) :list t))
 
 (defun mapcan (function list &rest more-lists)
-  _N"Applies fn to successive elements of list, returns NCONC of results."
+  "Applies fn to successive elements of list, returns NCONC of results."
   (map1 function (cons list more-lists) :nconc t))
 
 (defun mapl (function list &rest more-lists)
-  _N"Applies fn to successive CDRs of list, returns ()."
+  "Applies fn to successive CDRs of list, returns ()."
   (map1 function (cons list more-lists) nil nil))
 
 (defun maplist (function list &rest more-lists)
-  _N"Applies fn to successive CDRs of list, returns list of results."
+  "Applies fn to successive CDRs of list, returns list of results."
   (map1 function (cons list more-lists) :list nil))
 
 (defun mapcon (function list &rest more-lists)
-  _N"Applies fn to successive CDRs of lists, returns NCONC of results."
+  "Applies fn to successive CDRs of lists, returns NCONC of results."
   (map1 function (cons list more-lists) :nconc nil))
 
 
 ;;; Functions for compatibility sake:
 
 (defun memq (item list)
-  _N"Returns tail of list beginning with first element eq to item"
+  "Returns tail of list beginning with first element eq to item"
   (declare (inline member)
 	   (optimize (inhibit-warnings 3))) ; from MEMBER optimizations
   (member item list :test #'eq))
 
 (defun assq (item alist)
-  _N"Return the first pair of alist where item EQ the key of pair"
+  "Return the first pair of alist where item EQ the key of pair"
   (declare (inline assoc))
   (assoc item alist :test #'eq))
 
 (defun delq (item list)
-  _N"Returns list with all elements with all elements EQ to ITEM deleted."
+  "Returns list with all elements with all elements EQ to ITEM deleted."
   (let ((list list))
     (do ((x list (cdr x))
 	 (splice '()))
diff --git a/code/load.lisp b/code/load.lisp
index 91046abdb7912fbb42ea7621721bc2f85ada09dc..17c14acf2bb9f371722f8932a818e7b8aef83d1e 100644
--- a/code/load.lisp
+++ b/code/load.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/load.lisp,v 1.94 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/load.lisp,v 1.95 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -32,39 +32,39 @@
 ;;; Public:
 
 (defvar *load-if-source-newer* :load-object
-  _N"The default for the :IF-SOURCE-NEWER argument to load.")
+  "The default for the :IF-SOURCE-NEWER argument to load.")
 
 (declaim (type (member :load-object :load-source :query :compile)
 	       *load-if-source-newer*))
 
 (defvar *load-source-types* '("lisp" "l" "cl" "lsp")
-  _N"The source file types which LOAD recognizes.")
+  "The source file types which LOAD recognizes.")
 
 (defvar *load-object-types*
   '(#.(c:backend-fasl-file-type c:*backend*)
     #.(c:backend-byte-fasl-file-type c:*backend*)
     "fasl")
-  _N"A list of the object file types recognized by LOAD.")
+  "A list of the object file types recognized by LOAD.")
 
 (defvar *load-lp-object-types*
   '(#.(string-upcase (c:backend-fasl-file-type c:*backend*))
     #.(string-upcase (c:backend-byte-fasl-file-type c:*backend*))
     "FASL")
-  _N"A list of the object file types recognized by LOAD for logical pathnames.")
+  "A list of the object file types recognized by LOAD for logical pathnames.")
 
 (declaim (list *load-source-types* *load-object-types* *load-lp-object-types*))
 
 (defvar *load-verbose* t
-  _N"The default for the :VERBOSE argument to Load.")
+  "The default for the :VERBOSE argument to Load.")
 
 (defvar *load-print* ()
-  _N"The default for the :PRINT argument to Load.")
+  "The default for the :PRINT argument to Load.")
 
 (defvar *load-truename* nil
-  _N"The TRUENAME of the file that LOAD is currently loading.")
+  "The TRUENAME of the file that LOAD is currently loading.")
 
 (defvar *load-pathname* nil
-  _N"The defaulted pathname that LOAD is currently loading.")
+  "The defaulted pathname that LOAD is currently loading.")
 
 (declaim (type (or pathname null) *load-truename* *load-pathname*)) 
 
@@ -72,7 +72,7 @@
 ;;; Internal state variables:
 
 (defvar *load-depth* 0
-  _N"Count of the number of recursive loads.")
+  "Count of the number of recursive loads.")
 (declaim (type index *load-depth*))
 (defvar *fasl-file*)
 (declaim (type lisp-stream *fasl-file*))
@@ -118,7 +118,7 @@
 ;;; offset.  We may need to have several, since load can be called recursively.
 
 (defvar *free-fop-tables* (list (make-array 1000))
-  _N"List of free fop tables for the fasloader.")
+  "List of free fop tables for the fasloader.")
 
 ;;; The current fop table.
 (defvar *current-fop-table*)
@@ -155,7 +155,7 @@
 ;;; cheaper to test for overflow that way.
 ;;;
 (defvar *fop-stack* (make-array 100)
-  _N"The fop stack (we only need one!).")
+  "The fop stack (we only need one!).")
 (declaim (simple-vector *fop-stack*))
 
 ;;; The index of the most recently pushed item on the fop-stack.
@@ -217,11 +217,11 @@
 ;;; FOP database:
 
 (defvar fop-codes (make-array 256)
-  _N"Vector indexed by a FaslOP that yields the FOP's name.")
+  "Vector indexed by a FaslOP that yields the FOP's name.")
 
 (defvar fop-functions
   (make-array 256 :initial-element #'(lambda () (error _"Losing FOP!")))
-  _N"Vector indexed by a FaslOP that yields a function of 0 arguments which
+  "Vector indexed by a FaslOP that yields a function of 0 arguments which
   will perform the operation.")
 
 (declaim (simple-vector fop-codes fop-functions))
@@ -495,7 +495,7 @@
 		      (if-source-newer nil if-source-newer-p)
 		      (if-does-not-exist :error) contents
 		      (external-format :default))
-  _N"Loads the file named by Filename into the Lisp environment.  The file type
+  "Loads the file named by Filename into the Lisp environment.  The file type
    (a.k.a extension) is defaulted if missing.  These options are defined:
 
    :IF-SOURCE-NEWER <keyword>
diff --git a/code/loop.lisp b/code/loop.lisp
index aca21f9925531714f26b62ccf1121f5ddf600cc4..94a927ee0e18339df760dc2b6520400e86ab0c0c 100644
--- a/code/loop.lisp
+++ b/code/loop.lisp
@@ -49,7 +49,7 @@
 
 #+cmu
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/loop.lisp,v 1.32 2010/03/19 15:18:59 rtoy Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/loop.lisp,v 1.33 2010/04/19 02:18:04 rtoy Exp $")
 
 ;;;; LOOP Iteration Macro
 
@@ -972,7 +972,7 @@ a LET-like macro, and a SETQ-like macro, which perform LOOP-style destructuring.
 
 ;;;INTERFACE: Traditional, ANSI, Lucid.
 (defmacro loop-finish () 
-  _N"Causes the iteration to terminate \"normally\", the same as implicit
+  "Causes the iteration to terminate \"normally\", the same as implicit
 termination by an iteration driving clause, or by use of WHILE or
 UNTIL -- the epilogue code (if any) will be run, and any implicitly
 collected result will be returned as the value of the LOOP."
diff --git a/code/mipsstrops.lisp b/code/mipsstrops.lisp
index 3629f3586980489af6d01750df95f6eb2b82339c..734a1ae721909e884dfae496282fd00f0a229942 100644
--- a/code/mipsstrops.lisp
+++ b/code/mipsstrops.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/mipsstrops.lisp,v 1.9 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/mipsstrops.lisp,v 1.10 2010/04/19 02:18:04 rtoy Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -32,7 +32,7 @@
 (defun %sp-string-compare (string1 start1 end1 string2 start2 end2)
   (declare (simple-string string1 string2))
   (declare (fixnum start1 end1 start2 end2))
-  _N"Compares the substrings specified by String1 and String2 and returns
+  "Compares the substrings specified by String1 and String2 and returns
 NIL if the strings are String=, or the lowest index of String1 in
 which the two differ. If one string is longer than the other and the
 shorter is a prefix of the longer, the length of the shorter + start1 is
@@ -67,7 +67,7 @@ be simple strings."
 (defun %sp-reverse-string-compare (string1 start1 end1 string2 start2 end2)
   (declare (simple-string string1 string2))
   (declare (fixnum start1 end1 start2 end2))
-  _N"Like %sp-string-compare, only backwards."
+  "Like %sp-string-compare, only backwards."
   (let ((len1 (- end1 start1))
 	(len2 (- end2 start2)))
     (declare (fixnum len1 len2))
@@ -113,7 +113,7 @@ be simple strings."
   (declare (type (simple-array (unsigned-byte 8) (256)) table)
 	   (type (or simple-string system-area-pointer) string)
 	   (fixnum start end mask))
-  _N"%SP-Find-Character-With-Attribute  String, Start, End, Table, Mask
+  "%SP-Find-Character-With-Attribute  String, Start, End, Table, Mask
   The codes of the characters of String from Start to End are used as indices
   into the Table, which is a U-Vector of 8-bit bytes. When the number picked
   up from the table bitwise ANDed with Mask is non-zero, the current
@@ -126,7 +126,7 @@ be simple strings."
 	(return index)))))
 
 (defun %sp-reverse-find-character-with-attribute (string start end table mask)
-  _N"Like %SP-Find-Character-With-Attribute, only sdrawkcaB."
+  "Like %SP-Find-Character-With-Attribute, only sdrawkcaB."
   (declare (type (or simple-string system-area-pointer) string)
 	   (fixnum start end mask)
 	   (type (array (unsigned-byte 8) (256)) table))
@@ -138,7 +138,7 @@ be simple strings."
 	(return index)))))
 
 (defun %sp-find-character (string start end character)
-  _N"%SP-Find-Character  String, Start, End, Character
+  "%SP-Find-Character  String, Start, End, Character
   Searches String for the Character from Start to End.  If the character is
   found, the corresponding index into String is returned, otherwise NIL is
   returned."
@@ -156,7 +156,7 @@ be simple strings."
   (declare (type (or simple-string system-area-pointer) string)
 	   (fixnum start end)
 	   (base-char character))
-  _N"%SP-Reverse-Find-Character  String, Start, End, Character
+  "%SP-Reverse-Find-Character  String, Start, End, Character
   Searches String for Character from End to Start.  If the character is
   found, the corresponding index into String is returned, otherwise NIL is
   returned."
@@ -172,7 +172,7 @@ be simple strings."
   (declare (type (or simple-string system-area-pointer) string)
 	   (fixnum start end)
 	   (base-char character))
-  _N"%SP-Skip-Character  String, Start, End, Character
+  "%SP-Skip-Character  String, Start, End, Character
   Returns the index of the first character between Start and End which
   is not Char=  to Character, or NIL if there is no such character."
   (maybe-sap-maybe-string (string)
@@ -186,7 +186,7 @@ be simple strings."
   (declare (type (or simple-string system-area-pointer) string)
 	   (fixnum start end)
 	   (base-char character))
-  _N"%SP-Skip-Character  String, Start, End, Character
+  "%SP-Skip-Character  String, Start, End, Character
   Returns the index of the last character between Start and End which
   is not Char=  to Character, or NIL if there is no such character."
   (maybe-sap-maybe-string (string)
@@ -198,7 +198,7 @@ be simple strings."
 	  (return index)))))
 
 (defun %sp-string-search (string1 start1 end1 string2 start2 end2)
-  _N"%SP-String-Search  String1, Start1, End1, String2, Start2, End2
+  "%SP-String-Search  String1, Start1, End1, String2, Start2, End2
    Searches for the substring of String1 specified in String2.
    Returns an index into String2 or NIL if the substring wasn't
    found."
diff --git a/code/misc.lisp b/code/misc.lisp
index e97a334f74c8bccdbd6ec6bcb3399a3a90f1cc64..22c9c27eb611066f995c13663ccda237c4bb1ca9 100644
--- a/code/misc.lisp
+++ b/code/misc.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/misc.lisp,v 1.39 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/misc.lisp,v 1.40 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -57,7 +57,7 @@
       (values (info function documentation name)))))
 
 (defun documentation (x doc-type)
-  _N"Returns the documentation string of Doc-Type for X, or NIL if
+  "Returns the documentation string of Doc-Type for X, or NIL if
   none exists.  System doc-types are VARIABLE, FUNCTION, STRUCTURE, TYPE,
   SETF, and T."
   (flet (;; CMUCL random-documentation.
@@ -161,7 +161,7 @@
 (sys:register-lisp-runtime-feature :unicode)
 
 (defun featurep (x)
-  _N"If X is an atom, see if it is present in *FEATURES*.  Also
+  "If X is an atom, see if it is present in *FEATURES*.  Also
   handle arbitrary combinations of atoms using NOT, AND, OR."
   (if (consp x)
       (case (car x)
@@ -176,37 +176,37 @@
 ;;; Other Environment Inquiries.
 
 (defun lisp-implementation-type ()
-  _N"Returns a string describing the implementation type."
+  "Returns a string describing the implementation type."
   "CMU Common Lisp")
 
 (defun lisp-implementation-version ()
-  _N"Returns a string describing the implementation version."
+  "Returns a string describing the implementation version."
   (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
 	  #+unicode _" Unicode" #-unicode ""))
 
 (defun machine-instance ()
-  _N"Returns a string giving the name of the local machine."
+  "Returns a string giving the name of the local machine."
   (unix:unix-gethostname))
 
 (defvar *software-type* "Unix"
-  _N"The value of SOFTWARE-TYPE.  Set in FOO-os.lisp.")
+  "The value of SOFTWARE-TYPE.  Set in FOO-os.lisp.")
 
 (defun software-type ()
-  _N"Returns a string describing the supporting software."
+  "Returns a string describing the supporting software."
   *software-type*)
 
 (defvar *short-site-name* _"Unknown"
-  _N"The value of SHORT-SITE-NAME.  Set in library:site-init.lisp.")
+  "The value of SHORT-SITE-NAME.  Set in library:site-init.lisp.")
 
 (defun short-site-name ()
-  _N"Returns a string with the abbreviated site name."
+  "Returns a string with the abbreviated site name."
   *short-site-name*)
 
 (defvar *long-site-name* _"Site name not initialized"
-  _N"The value of LONG-SITE-NAME.  Set in library:site-init.lisp.")
+  "The value of LONG-SITE-NAME.  Set in library:site-init.lisp.")
 
 (defun long-site-name ()
-  _N"Returns a string with the long form of the site name."
+  "Returns a string with the long form of the site name."
   *long-site-name*)
 
 
@@ -228,7 +228,7 @@
 (defvar *dribble-stream* nil)
 
 (defun dribble (&optional pathname &key (if-exists :append))
-  _N"With a file name as an argument, dribble opens the file and
+  "With a file name as an argument, dribble opens the file and
    sends a record of further I/O to that file.  Without an
    argument, it closes the dribble file, and quits logging."
   (cond (pathname
@@ -260,7 +260,7 @@
   (values))
 
 (defun ed (&optional x)
-  _N"Default implementation of ed.  This does nothing.  If hemlock is
+  "Default implementation of ed.  This does nothing.  If hemlock is
   loaded, ed can be used to edit a file"
   (declare (ignorable x))
   (values))
diff --git a/code/module.lisp b/code/module.lisp
index d4157959d39116fe33572346433bfd811cfce81a..69ccf12ad421eb8847e33bf8ffc4ba54b4cb6553 100644
--- a/code/module.lisp
+++ b/code/module.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/module.lisp,v 1.12 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/module.lisp,v 1.13 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 
@@ -31,21 +31,21 @@
 ;;;; Exported specials.
 
 (defvar *modules* ()
-  _N"This is a list of module names that have been loaded into Lisp so far.
+  "This is a list of module names that have been loaded into Lisp so far.
    It is used by PROVIDE and REQUIRE.")
 
 (defvar *require-verbose* t
-  _N"*load-verbose* is bound to this before loading files.")
+  "*load-verbose* is bound to this before loading files.")
 
 (defvar *module-provider-functions*
     '(module-provide-cmucl-defmodule module-provide-cmucl-library)
-  _N"See function documentation for REQUIRE")
+  "See function documentation for REQUIRE")
 
 ;;;; Defmodule.
 
 (defvar *module-file-translations* (make-hash-table :test #'equal))
 (defmacro defmodule (name &rest files)
-  _N"Defines a module by registering the files that need to be loaded when
+  "Defines a module by registering the files that need to be loaded when
    the module is required.  If name is a symbol, its print name is used
    after downcasing it."
   `(%define-module ,name ',files))
@@ -62,14 +62,14 @@
 ;;;; Provide and Require.
 
 (defun provide (module-name)
-  _N"Adds a new module name to *modules* indicating that it has been loaded.
+  "Adds a new module name to *modules* indicating that it has been loaded.
    Module-name may be any valid string designator.  All comparisons are
    done using string=, i.e. module names are case-sensitive."
   (pushnew (module-name-string module-name) *modules* :test #'string=)
   t)
 
 (defun require (module-name &optional pathname)
-  _N"Loads a module when it has not been already.  Pathname, if supplied,
+  "Loads a module when it has not been already.  Pathname, if supplied,
    is a single pathname or list of pathnames to be loaded if the module
    needs to be.  If pathname is not supplied, then functions from the list
    *MODULE-PROVIDER-FUNCTIONS* are called in order with the stringified
@@ -115,11 +115,11 @@
 ;;;; Misc.
 
 (defun module-name-string (name)
-  _N"Coerce a string designator to a module name."
+  "Coerce a string designator to a module name."
   (string name))
 
 (defun module-default-pathname (module-name)
-  _N"Derive a default pathname to try to load for an undefined module
+  "Derive a default pathname to try to load for an undefined module
 named module-name.  The default pathname is constructed from the
 module-name by appending the suffix \"-LIBRARY\" to it, and merging
 with \"modules:\".  Note that both the module-name and the suffix are
diff --git a/code/multi-proc.lisp b/code/multi-proc.lisp
index 5210d9807c44ce483603f82358ddf7ddf3e0d2b6..ad65bf064e9cce2dc4d137724517e5d9125d6e4c 100644
--- a/code/multi-proc.lisp
+++ b/code/multi-proc.lisp
@@ -5,7 +5,7 @@
 ;;; the Public domain, and is provided 'as is'.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/multi-proc.lisp,v 1.45 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/multi-proc.lisp,v 1.46 2010/04/19 02:18:04 rtoy Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -727,7 +727,7 @@
 (declaim (inline get-real-time))
 ;;;
 (defun get-real-time ()
-  _N"Return the real time in seconds."
+  "Return the real time in seconds."
   (declare (optimize (speed 3) (safety 0)))
   (multiple-value-bind (ignore seconds useconds)
       (unix:unix-gettimeofday)
@@ -741,7 +741,7 @@
 (declaim (inline get-run-time))
 ;;;
 (defun get-run-time ()
-  _N"Return the run time in seconds"
+  "Return the run time in seconds"
   (declare (optimize (speed 3) (safety 0)))
   (multiple-value-bind (ignore utime-sec utime-usec stime-sec stime-usec)
       (unix:unix-fast-getrusage unix:rusage_self)
@@ -762,7 +762,7 @@
 ;;; Process-Whostate  --  Public
 ;;;
 (defun process-whostate (process)
-  _N"Return the process state which is either Run, Killed, or a wait reason."
+  "Return the process state which is either Run, Killed, or a wait reason."
   (cond ((eq (process-state process) :killed)
 	 "Killed")
 	((process-wait-function process)
@@ -795,18 +795,18 @@
 ;;;
 (declaim (inline current-process))
 (defun current-process ()
-  _N"Returns the current process."
+  "Returns the current process."
   *current-process*)
 
 (declaim (list *all-processes*))
 (defvar *all-processes* nil
-  _N"A list of all alive processes.")
+  "A list of all alive processes.")
 
 ;;; All-Processes  --  Public
 ;;;
 (declaim (inline all-processes))
 (defun all-processes ()
-  _N"Return a list of all the live processes."
+  "Return a list of all the live processes."
   *all-processes*)
 
 (declaim (type (or null process) *initial-process*))
@@ -820,7 +820,7 @@
 (defvar *inhibit-scheduling* t)
 ;;;
 (defmacro without-scheduling (&body body)
-  _N"Execute the body the scheduling disabled."
+  "Execute the body the scheduling disabled."
   `(let ((inhibit *inhibit-scheduling*))
     (unwind-protect
 	 (progn
@@ -829,22 +829,22 @@
       (setf *inhibit-scheduling* inhibit))))
 
 (defmacro atomic-incf (reference &optional (delta 1))
-  _N"Increaments the reference by delta in a single atomic operation"
+  "Increaments the reference by delta in a single atomic operation"
   `(without-scheduling
     (incf ,reference ,delta)))
 
 (defmacro atomic-decf (reference &optional (delta 1))
-  _N"Decrements the reference by delta in a single atomic operation"
+  "Decrements the reference by delta in a single atomic operation"
   `(without-scheduling
     (decf ,reference ,delta)))
 
 (defmacro atomic-push (obj place)
-  _N"Atomically push object onto place."
+  "Atomically push object onto place."
   `(without-scheduling
     (push ,obj ,place)))
 
 (defmacro atomic-pop (place)
-  _N"Atomically pop place."
+  "Atomically pop place."
   `(without-scheduling
     (pop ,place)))
 
@@ -894,7 +894,7 @@
 		     (run-reasons (list :enable))
 		     (arrest-reasons nil)
 		     (initial-bindings nil))
-  _N"Make a process which will run FUNCTION when it starts up.  By
+  "Make a process which will run FUNCTION when it starts up.  By
   default the process is created in a runnable (active) state.
   If FUNCTION is NIL, the process is started in a killed state; it may
   be restarted later with process-preset.
@@ -1015,7 +1015,7 @@
 ;;; Process-Interrupt  --  Public
 ;;;
 (defun process-interrupt (process function)
-  _N"Interrupt process and cause it to evaluate function."
+  "Interrupt process and cause it to evaluate function."
   ;; Place the interrupt function at the end of process's interrupts
   ;; queue, to be called the next time the process is scheduled.
   (without-scheduling
@@ -1027,7 +1027,7 @@
 ;;; Destroy-Process  --  Public
 ;;;
 (defun destroy-process (process)
-  _N"Destroy a process. The process is sent a interrupt which throws to
+  "Destroy a process. The process is sent a interrupt which throws to
   the end of the process allowing it to unwind gracefully."
   (declare (type process process))
   (assert (not (eq process *current-process*)))
@@ -1046,7 +1046,7 @@
   (process-yield))
 
 (defun restart-process (process)
-  _N"Restart process by unwinding it to its initial state and calling its
+  "Restart process by unwinding it to its initial state and calling its
   initial function."
   (destroy-process process)
   (if *inhibit-scheduling*		;Called inside without-scheduling?
@@ -1112,7 +1112,7 @@
 
 ;;; Process-Preset
 (defun process-preset (process function &rest args)
-  _N"Restart process, unwinding it to its initial state and calls
+  "Restart process, unwinding it to its initial state and calls
   function with args."
   (setf (process-initial-function process) function)
   (setf (process-initial-args process) args)
@@ -1122,7 +1122,7 @@
 ;;; Disable-Process  --  Public
 ;;;
 (defun disable-process (process)
-  _N"Disable process from being runnable until enabled."
+  "Disable process from being runnable until enabled."
   (without-scheduling
    (assert (not (eq (process-state process) :killed)))
    (setf (process-state process) :inactive)))
@@ -1130,7 +1130,7 @@
 ;;; Enable-Process  --  Public
 ;;;
 (defun enable-process (process)
-  _N"Allow process to become runnable again after it has been disabled."
+  "Allow process to become runnable again after it has been disabled."
   (without-scheduling
    (assert (not (eq (process-state process) :killed)))
    (setf (process-state process) :active)))
@@ -1138,7 +1138,7 @@
 ;;; Process-Wait  --  Public.
 ;;;
 (defun process-wait (whostate predicate &rest args)
-  _N"Causes the process to wait until predicate returns True. Processes
+  "Causes the process to wait until predicate returns True. Processes
   can only call process-wait when scheduling is enabled, and the predicate
   can not call process-wait. Since the predicate may be evaluated may
   times by the scheduler it should be relative fast native compiled code.
@@ -1160,7 +1160,7 @@
 ;;;
 (defun process-wait-with-timeout (whostate timeout predicate &rest args)
   (declare (type (or fixnum float) timeout))
-  _N"Causes the process to wait until predicate returns True, or the
+  "Causes the process to wait until predicate returns True, or the
   number of seconds specified by timeout has elapsed. The timeout may
   be a fixnum or a float in seconds.  The single True predicate value is
   returned, or NIL if the timeout was reached."
@@ -1210,7 +1210,7 @@
 ;;; Shutdown-multi-processing  --  Internal.
 ;;;
 (defun shutdown-multi-processing ()
-  _N"Try to gracefully destroy all the processes giving them some
+  "Try to gracefully destroy all the processes giving them some
   chance to unwinding, before shutting down multi-processing. This is
   currently necessary before a purify and is performed before a save-lisp.
   Multi-processing can be restarted by calling init-multi-processing."
@@ -1262,7 +1262,7 @@
 (defvar *idle-loop-timeout* 0.1d0)
 ;;;
 (defun idle-process-loop ()
-  _N"An idle loop to be run by the initial process. The select based event
+  "An idle loop to be run by the initial process. The select based event
   server is called with a timeout calculated from the minimum of the
   *idle-loop-timeout* and the time to the next process wait timeout.
   To avoid this delay when there are runnable processes the *idle-process*
@@ -1305,7 +1305,7 @@
 ;;;
 (defun process-yield ()
   (declare (optimize (speed 3)))
-  _N"Allow other processes to run."
+  "Allow other processes to run."
   (unless *inhibit-scheduling*
     ;; Catch any FP exceptions before entering the scheduler.
     #+x87 (kernel:float-wait)
@@ -1448,7 +1448,7 @@
 ;;; The real time in seconds accrued while the process was scheduled.
 ;;;
 (defun process-real-time (process)
-  _N"Return the accrued real time elapsed while the given process was
+  "Return the accrued real time elapsed while the given process was
   scheduled. The returned time is a double-float in seconds."
   (declare (type process process))
   (if (eq process *current-process*)
@@ -1463,7 +1463,7 @@
 ;;; The run time in seconds accrued while the process was scheduled.
 ;;;
 (defun process-run-time (process)
-  _N"Return the accrued run time elapsed for the given process. The returned
+  "Return the accrued run time elapsed for the given process. The returned
   time is a double-float in seconds."
   (declare (type process process))
   (if (eq process *current-process*)
@@ -1479,7 +1479,7 @@
 ;;; de-scheduled.
 ;;;
 (defun process-idle-time (process)
-  _N"Return the real time elapsed since the given process was last
+  "Return the real time elapsed since the given process was last
   descheduled. The returned time is a double-float in seconds."
   (declare (type process process))
   (if (eq process *current-process*)
@@ -1494,7 +1494,7 @@
 ;;; good idea yet as the CMUCL code is not too interrupt safe.
 ;;;
 (defun start-sigalrm-yield (&optional (sec 0) (usec 500000))
-  _N"Start a regular SIGALRM interrupt which calls process-yield. An optional
+  "Start a regular SIGALRM interrupt which calls process-yield. An optional
   time in seconds and micro seconds may be provided. Note that CMUCL code
   base is not too interrupt safe so this may cause problems."
   (declare (fixnum sec usec))
@@ -1554,7 +1554,7 @@
 ;;; Wait until FD is usable for DIRECTION.
 ;;;
 (defun process-wait-until-fd-usable (fd direction &optional timeout)
-  _N"Wait until FD is usable for DIRECTION and return True. DIRECTION should be
+  "Wait until FD is usable for DIRECTION and return True. DIRECTION should be
   either :INPUT or :OUTPUT. TIMEOUT, if supplied, is the number of seconds to
   wait before giving up and returing NIL."
   (declare (type kernel:index fd)
@@ -1627,7 +1627,7 @@
 ;;; rather than blocking.
 ;;;
 (defun sleep (n)
-  _N"This function causes execution to be suspended for N seconds.  N may
+  "This function causes execution to be suspended for N seconds.  N may
   be any non-negative, non-complex number."
   (when (or (not (realp n))
 	    (minusp n))
@@ -1670,7 +1670,7 @@
 ;;; With-Timeout  --  Public
 ;;;
 (defmacro with-timeout ((timeout &body timeout-forms) &body body)
-  _N"Executes body and returns the values of the last form in body. However, if
+  "Executes body and returns the values of the last form in body. However, if
   the execution takes longer than timeout seconds, abort it and evaluate
   timeout-forms, returning the values of last form."
   `(flet ((fn () . ,body)
@@ -1681,7 +1681,7 @@
 ;;; Show-Processes  --  Public
 ;;;
 (defun show-processes (&optional verbose)
-  _N"Show the all the processes, their whostate, and state. If the optional
+  "Show the all the processes, their whostate, and state. If the optional
   verbose argument is true then the run, real, and idle times are also
   shown."
   (fresh-line)
@@ -1700,7 +1700,7 @@
 ;;; Top-Level  --  Internal
 ;;;
 (defun top-level ()
-  _N"Top-level READ-EVAL-PRINT loop for processes."
+  "Top-level READ-EVAL-PRINT loop for processes."
   (let ((* nil) (** nil) (*** nil)
 	(- nil) (+ nil) (++ nil) (+++ nil)
 	(/// nil) (// nil) (/ nil)
@@ -1731,7 +1731,7 @@
 ;;; Startup-Idle-and-Top-Level-Loops -- Internal
 ;;;
 (defun startup-idle-and-top-level-loops ()
-  _N"Enter the idle loop, starting a new process to run the top level loop.
+  "Enter the idle loop, starting a new process to run the top level loop.
   The awaking of sleeping processes is timed better with the idle loop process
   running, and starting a new process for the top level loop supports a
   simultaneous interactive session. Such an initialisation will likely be the
@@ -1752,7 +1752,7 @@
 (defun start-lisp-connection-listener (&key (port 1025)
 					    (password (random (expt 2 24))))
   (declare (type (unsigned-byte 16) port))
-  _N"Create a Lisp connection listener, listening on a TCP port for new
+  "Create a Lisp connection listener, listening on a TCP port for new
   connections and starting a new top-level loop for each. If a password
   is not given then one will be generated and reported.  A search is
   performed for the first free port starting at the given port which
@@ -1928,7 +1928,7 @@
 (defmacro with-lock-held ((lock &optional (whostate "Lock Wait")
 				&key (wait t) timeout)
 			  &body body)
-  _N"Execute the body with the lock held. If the lock is held by another
+  "Execute the body with the lock held. If the lock is held by another
   process then the current process waits until the lock is released or
   an optional timeout is reached. The optional wait timeout is a time in
   seconds acceptable to process-wait-with-timeout.  The results of the
diff --git a/code/ntrace.lisp b/code/ntrace.lisp
index 8756106a4e5270f93ec417f2bcbecf5a18afa9ee..5a9ea56a084e876a05c82856272a107285bb53e8 100644
--- a/code/ntrace.lisp
+++ b/code/ntrace.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/ntrace.lisp,v 1.44 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/ntrace.lisp,v 1.45 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -28,15 +28,15 @@
 (use-package :fwrappers)
 
 (defvar *trace-values* nil
-  _N"This is bound to the returned values when evaluating :BREAK-AFTER and
+  "This is bound to the returned values when evaluating :BREAK-AFTER and
    :PRINT-AFTER forms.")
 
 (defvar *max-trace-indentation* 40
-  _N"If the trace indentation exceeds this value, then indentation restarts at
+  "If the trace indentation exceeds this value, then indentation restarts at
    0.")
 
 (defvar *trace-encapsulate-default* :default
-  _N"The default value for the :ENCAPSULATE option to trace.")
+  "The default value for the :ENCAPSULATE option to trace.")
 
 (defvar *trace-encapsulate-package-names*
   '("LISP"
@@ -51,7 +51,7 @@
     "SYSTEM"
     "COMPILER"
     "TRACE")
-  _N"List of package names.  Encapsulate functions from these packages
+  "List of package names.  Encapsulate functions from these packages
    by default.  This should at least include the packages of functions
    used by TRACE, directly or indirectly.")
 
@@ -689,7 +689,7 @@
 ;;; TRACE -- Public.
 ;;;
 (defmacro trace (&rest specs)
-  _N"TRACE {Option Global-Value}* {Name {Option Value}*}*
+  "TRACE {Option Global-Value}* {Name {Option Value}*}*
    TRACE is a debugging tool that prints information when specified functions
    are called.  In its simplest form:
        (trace Name-1 Name-2 ...)
@@ -806,7 +806,7 @@
   t)
 
 (defmacro untrace (&rest specs)
-  _N"Removes tracing from the specified functions.  With no args, untraces all
+  "Removes tracing from the specified functions.  With no args, untraces all
    functions."
   (if specs
       (collect ((res))
diff --git a/code/numbers.lisp b/code/numbers.lisp
index e9d34aaa5d8def707e4e9bd4bec0786d66ca3511..44a40a1eda60b5166939afae597388536ea18fa3 100644
--- a/code/numbers.lisp
+++ b/code/numbers.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/numbers.lisp,v 1.68 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/numbers.lisp,v 1.69 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -119,7 +119,7 @@
 ;;; NUMBER-DISPATCH  --  Interface
 ;;;
 (defmacro number-dispatch (var-specs &body cases)
-  _N"NUMBER-DISPATCH ({(Var Type)}*) {((Type*) Form*) | (Symbol Arg*)}*
+  "NUMBER-DISPATCH ({(Var Type)}*) {((Type*) Form*) | (Symbol Arg*)}*
   A vaguely case-like macro that does number cross-product dispatches.  The
   Vars are the variables we are dispatching off of.  The Type paired with each
   Var is used in the error message when no case matches.  Each case specifies a
@@ -285,7 +285,7 @@
 ;;;; Complexes:
 
 (defun upgraded-complex-part-type (spec &optional environment)
-  _N"Returns the element type of the most specialized COMPLEX number type that
+  "Returns the element type of the most specialized COMPLEX number type that
    can hold parts of type Spec."
   (declare (ignore environment))
   (cond ((subtypep spec 'single-float)
@@ -320,7 +320,7 @@
 		:format-arguments (list spec)))))
 
 (defun complex (realpart &optional (imagpart 0))
-  _N"Builds a complex number from the specified components."
+  "Builds a complex number from the specified components."
   (flet ((%%make-complex (realpart imagpart)
 	   (cond #+long-float
 		 ((and (typep realpart 'long-float)
@@ -348,7 +348,7 @@
     (float-contagion %%make-complex realpart imagpart (rational)))))
 
 (defun realpart (number)
-  _N"Extracts the real part of a number."
+  "Extracts the real part of a number."
   (typecase number
     #+long-float
     ((complex long-float)
@@ -366,7 +366,7 @@
      number)))
 
 (defun imagpart (number)
-  _N"Extracts the imaginary part of a number."
+  "Extracts the imaginary part of a number."
   (typecase number
     #+long-float
     ((complex long-float)
@@ -386,14 +386,14 @@
      0)))
 
 (defun conjugate (number)
-  _N"Returns the complex conjugate of NUMBER.  For non-complex numbers, this is
+  "Returns the complex conjugate of NUMBER.  For non-complex numbers, this is
   an identity."
   (if (complexp number)
       (complex (realpart number) (- (imagpart number)))
       number))
 
 (defun signum (number)
-  _N"If NUMBER is zero, return NUMBER, else return (/ NUMBER (ABS NUMBER))."
+  "If NUMBER is zero, return NUMBER, else return (/ NUMBER (ABS NUMBER))."
   (if (zerop number)
       number
       (if (rationalp number)
@@ -404,11 +404,11 @@
 ;;;; Ratios.
 
 (defun numerator (number)
-  _N"Return the numerator of NUMBER, which must be rational."
+  "Return the numerator of NUMBER, which must be rational."
   (numerator number))
 
 (defun denominator (number)
-  _N"Return the denominator of NUMBER, which must be rational."
+  "Return the denominator of NUMBER, which must be rational."
   (denominator number))
 
 
@@ -425,12 +425,12 @@
 	     ((null args) res)))))
 
 (define-arith + 0
-  _N"Returns the sum of its arguments.  With no args, returns 0.")
+  "Returns the sum of its arguments.  With no args, returns 0.")
 (define-arith * 1
-  _N"Returns the product of its arguments.  With no args, returns 1.")
+  "Returns the product of its arguments.  With no args, returns 1.")
 
 (defun - (number &rest more-numbers)
-  _N"Subtracts the second and all subsequent arguments from the first.
+  "Subtracts the second and all subsequent arguments from the first.
   With one arg, negates it."
   (if more-numbers
       (do ((nlist more-numbers (cdr nlist))
@@ -441,7 +441,7 @@
       (- number)))
 
 (defun / (number &rest more-numbers)
-  _N"Divides the first arg by each of the following arguments, in turn.
+  "Divides the first arg by each of the following arguments, in turn.
   With one arg, returns reciprocal."
   (if more-numbers
       (do ((nlist more-numbers (cdr nlist))
@@ -452,11 +452,11 @@
       (/ number)))
 
 (defun 1+ (number)
-  _N"Returns NUMBER + 1."
+  "Returns NUMBER + 1."
   (1+ number))
 
 (defun 1- (number)
-  _N"Returns NUMBER - 1."
+  "Returns NUMBER - 1."
   (1- number))
 
 
@@ -677,7 +677,7 @@
 ;;;; Truncate & friends.
 
 (defun truncate (number &optional (divisor 1))
-  _N"Returns number (or number/divisor) as an integer, rounded toward 0.
+  "Returns number (or number/divisor) as an integer, rounded toward 0.
   The second returned value is the remainder."
   (macrolet ((truncate-float (rtype)
 	       `(let* ((float-div (coerce divisor ',rtype))
@@ -749,7 +749,7 @@
 ;;; the divisor.
 ;;;
 (defun floor (number &optional (divisor 1))
-  _N"Returns the greatest integer not greater than number, or number/divisor.
+  "Returns the greatest integer not greater than number, or number/divisor.
   The second returned value is (mod number divisor)."
   (multiple-value-bind (tru rem) (truncate number divisor)
     (if (and (not (zerop rem))
@@ -765,7 +765,7 @@
 ;;; the divisor.
 ;;;
 (defun ceiling (number &optional (divisor 1))
-  _N"Returns the smallest integer not less than number, or number/divisor.
+  "Returns the smallest integer not less than number, or number/divisor.
   The second returned value is the remainder."
   (multiple-value-bind (tru rem) (truncate number divisor)
     (if (and (not (zerop rem))
@@ -777,7 +777,7 @@
 
 
 (defun round (number &optional (divisor 1))
-  _N"Rounds number (or number/divisor) to nearest integer.
+  "Rounds number (or number/divisor) to nearest integer.
   The second returned value is the remainder."
   (if (eql divisor 1)
       (round number)
@@ -800,13 +800,13 @@
 
 
 (defun rem (number divisor)
-  _N"Returns second result of TRUNCATE."
+  "Returns second result of TRUNCATE."
   (multiple-value-bind (tru rem) (truncate number divisor)
     (declare (ignore tru))
     rem))
 
 (defun mod (number divisor)
-  _N"Returns second result of FLOOR."
+  "Returns second result of FLOOR."
   (let ((rem (rem number divisor)))
     (if (and (not (zerop rem))
 	     (if (minusp divisor)
@@ -817,7 +817,7 @@
 
 
 (defun ftruncate (number &optional (divisor 1))
-  _N"Same as TRUNCATE, but returns first value as a float."
+  "Same as TRUNCATE, but returns first value as a float."
   (macrolet ((truncate-float (rtype)
 	       `(let* ((float-div (coerce divisor ',rtype))
 		       (res (%unary-ftruncate (/ number float-div))))
@@ -852,7 +852,7 @@
 
 
 (defun ffloor (number &optional (divisor 1))
-  _N"Same as FLOOR, but returns first value as a float."
+  "Same as FLOOR, but returns first value as a float."
   (multiple-value-bind (tru rem) (ftruncate number divisor)
     (if (and (not (zerop rem))
 	     (if (minusp divisor)
@@ -862,7 +862,7 @@
 	(values tru rem))))
 
 (defun fceiling (number &optional (divisor 1))
-  _N"Same as CEILING, but returns first value as a float." 
+  "Same as CEILING, but returns first value as a float." 
   (multiple-value-bind (tru rem) (ftruncate number divisor)
     (if (and (not (zerop rem))
 	     (if (minusp divisor)
@@ -873,7 +873,7 @@
 
 
 (defun fround (number &optional (divisor 1))
-  _N"Same as ROUND, but returns first value as a float."
+  "Same as ROUND, but returns first value as a float."
   (multiple-value-bind (res rem)
       (round number divisor)
     (values (float res (if (floatp rem) rem 1.0)) rem)))
@@ -881,7 +881,7 @@
 ;;;; Comparisons:
 
 (defun = (number &rest more-numbers)
-  _N"Returns T if all of its arguments are numerically equal, NIL otherwise."
+  "Returns T if all of its arguments are numerically equal, NIL otherwise."
   (declare (optimize (safety 2)) (number number)
 	   (dynamic-extent more-numbers))
   (do ((nlist more-numbers (cdr nlist)))
@@ -890,7 +890,7 @@
      (if (not (= (car nlist) number)) (return nil))))
 
 (defun /= (number &rest more-numbers)
-  _N"Returns T if no two of its arguments are numerically equal, NIL otherwise."
+  "Returns T if no two of its arguments are numerically equal, NIL otherwise."
   (declare (optimize (safety 2)) (number number)
 	   (dynamic-extent more-numbers))
   (do* ((head number (car nlist))
@@ -904,7 +904,7 @@
        (return nil))))
 
 (defun < (number &rest more-numbers)
-  _N"Returns T if its arguments are in strictly increasing order, NIL otherwise."
+  "Returns T if its arguments are in strictly increasing order, NIL otherwise."
   (declare (optimize (safety 2)) (real number)
 	   (dynamic-extent more-numbers))
   (do* ((n number (car nlist))
@@ -914,7 +914,7 @@
      (if (not (< n (car nlist))) (return nil))))
 
 (defun > (number &rest more-numbers)
-  _N"Returns T if its arguments are in strictly decreasing order, NIL otherwise."
+  "Returns T if its arguments are in strictly decreasing order, NIL otherwise."
   (declare (optimize (safety 2)) (real number)
 	   (dynamic-extent more-numbers))
   (do* ((n number (car nlist))
@@ -924,7 +924,7 @@
      (if (not (> n (car nlist))) (return nil))))
 
 (defun <= (number &rest more-numbers)
-  _N"Returns T if arguments are in strictly non-decreasing order, NIL otherwise."
+  "Returns T if arguments are in strictly non-decreasing order, NIL otherwise."
   (declare (optimize (safety 2)) (real number)
 	   (dynamic-extent more-numbers))
   (do* ((n number (car nlist))
@@ -934,7 +934,7 @@
      (if (not (<= n (car nlist))) (return nil))))
 
 (defun >= (number &rest more-numbers)
-  _N"Returns T if arguments are in strictly non-increasing order, NIL otherwise."
+  "Returns T if arguments are in strictly non-increasing order, NIL otherwise."
   (declare (optimize (safety 2)) (real number)
 	   (dynamic-extent more-numbers))
   (do* ((n number (car nlist))
@@ -944,7 +944,7 @@
      (if (not (>= n (car nlist))) (return nil))))
 
 (defun max (number &rest more-numbers)
-  _N"Returns the greatest of its arguments."
+  "Returns the greatest of its arguments."
   (declare (optimize (safety 2)) (real number)
 	   (dynamic-extent more-numbers))
   (dolist (real more-numbers)
@@ -953,7 +953,7 @@
   (the real number))
 
 (defun min (number &rest more-numbers)
-  _N"Returns the least of its arguments."
+  "Returns the least of its arguments."
   (declare (optimize (safety 2)) (real number)
 	   (dynamic-extent more-numbers))
   (do ((nlist more-numbers (cdr nlist))
@@ -1066,7 +1066,7 @@
 ;;; EQL -- Public
 ;;;
 (defun eql (obj1 obj2)
-  _N"Return T if OBJ1 and OBJ2 represent the same object, otherwise NIL."
+  "Return T if OBJ1 and OBJ2 represent the same object, otherwise NIL."
   (or (eq obj1 obj2)
       (if (or (typep obj2 'fixnum)
 	      (not (typep obj2 'number)))
@@ -1103,7 +1103,7 @@
 ;;;; Logicals:
 
 (defun logior (&rest integers)
-  _N"Returns the bit-wise or of its arguments.  Args must be integers."
+  "Returns the bit-wise or of its arguments.  Args must be integers."
   (declare (list integers))
   (if integers
       (do ((result (the integer (pop integers))
@@ -1112,7 +1112,7 @@
       0))
 
 (defun logxor (&rest integers)
-  _N"Returns the bit-wise exclusive or of its arguments.  Args must be integers."
+  "Returns the bit-wise exclusive or of its arguments.  Args must be integers."
   (declare (list integers))
   (if integers
       (do ((result (the integer (pop integers))
@@ -1121,7 +1121,7 @@
       0))
 
 (defun logand (&rest integers)
-  _N"Returns the bit-wise and of its arguments.  Args must be integers."
+  "Returns the bit-wise and of its arguments.  Args must be integers."
   (declare (list integers))
   (if integers
       (do ((result (the integer (pop integers))
@@ -1130,7 +1130,7 @@
       -1))
 
 (defun logeqv (&rest integers)
-  _N"Returns the bit-wise equivalence of its arguments.  Args must be integers."
+  "Returns the bit-wise equivalence of its arguments.  Args must be integers."
   (declare (list integers))
   (if integers
       (do ((result (the integer (pop integers))
@@ -1166,7 +1166,7 @@
 )
 
 (defun lognot (number)
-  _N"Returns the bit-wise logical not of integer."
+  "Returns the bit-wise logical not of integer."
   (etypecase number
     (fixnum (lognot (truly-the fixnum number)))
     (bignum (bignum-logical-not number))))
@@ -1214,7 +1214,7 @@
 
 
 (defun logcount (integer)
-  _N"Count the number of 1 bits if INTEGER is positive, and the number of 0 bits
+  "Count the number of 1 bits if INTEGER is positive, and the number of 0 bits
   if INTEGER is negative."
   (etypecase integer
     (fixnum
@@ -1227,18 +1227,18 @@
      (bignum-logcount integer))))
 
 (defun logtest (integer1 integer2)
-  _N"Predicate which returns T if logand of integer1 and integer2 is not zero."
+  "Predicate which returns T if logand of integer1 and integer2 is not zero."
   (logtest integer1 integer2))
 
 (defun logbitp (index integer)
-  _N"Predicate returns T if bit index of integer is a 1.  The least
+  "Predicate returns T if bit index of integer is a 1.  The least
 significant bit of INTEGER is bit 0."
   (etypecase integer
     (fixnum (logbitp index integer))
     (bignum (bignum-logbitp index integer))))
 
 (defun ash (integer count)
-  _N"Shifts integer left by count places preserving sign.  - count shifts right."
+  "Shifts integer left by count places preserving sign.  - count shifts right."
   (declare (integer integer count))
   (etypecase integer
     (fixnum
@@ -1265,7 +1265,7 @@ significant bit of INTEGER is bit 0."
 	 (bignum-ashift-right integer (- count))))))
 
 (defun integer-length (integer)
-  _N"Returns the number of significant bits in the absolute value of integer."
+  "Returns the number of significant bits in the absolute value of integer."
   (etypecase integer
     (fixnum
      (integer-length (truly-the fixnum integer)))
@@ -1276,35 +1276,35 @@ significant bit of INTEGER is bit 0."
 ;;;; Byte operations:
 
 (defun byte (size position)
-  _N"Returns a byte specifier which may be used by other byte functions."
+  "Returns a byte specifier which may be used by other byte functions."
   (byte size position))
 
 (defun byte-size (bytespec)
-  _N"Returns the size part of the byte specifier bytespec."
+  "Returns the size part of the byte specifier bytespec."
   (byte-size bytespec))
 
 (defun byte-position (bytespec)
-  _N"Returns the position part of the byte specifier bytespec."
+  "Returns the position part of the byte specifier bytespec."
   (byte-position bytespec))
 
 (defun ldb (bytespec integer)
-  _N"Extract the specified byte from integer, and right justify result."
+  "Extract the specified byte from integer, and right justify result."
   (ldb bytespec integer))
 
 (defun ldb-test (bytespec integer)
-  _N"Returns T if any of the specified bits in integer are 1's."
+  "Returns T if any of the specified bits in integer are 1's."
   (ldb-test bytespec integer))
 
 (defun mask-field (bytespec integer)
-  _N"Extract the specified byte from integer,  but do not right justify result."
+  "Extract the specified byte from integer,  but do not right justify result."
   (mask-field bytespec integer))
 
 (defun dpb (newbyte bytespec integer)
-  _N"Returns new integer with newbyte in specified position, newbyte is right justified."
+  "Returns new integer with newbyte in specified position, newbyte is right justified."
   (dpb newbyte bytespec integer))
 
 (defun deposit-field (newbyte bytespec integer)
-  _N"Returns new integer with newbyte in specified position, newbyte is not right justified."
+  "Returns new integer with newbyte in specified position, newbyte is not right justified."
   (deposit-field newbyte bytespec integer))
 
 
@@ -1341,56 +1341,56 @@ significant bit of INTEGER is bit 0."
 ;;;     using any of the constants declared below.
 
 (defconstant boole-clr 0
-  _N"Boole function op, makes BOOLE return 0.")
+  "Boole function op, makes BOOLE return 0.")
 
 (defconstant boole-set 1
-  _N"Boole function op, makes BOOLE return -1.")
+  "Boole function op, makes BOOLE return -1.")
 
 (defconstant boole-1   2
-  _N"Boole function op, makes BOOLE return integer1.")
+  "Boole function op, makes BOOLE return integer1.")
 
 (defconstant boole-2   3
-  _N"Boole function op, makes BOOLE return integer2.")
+  "Boole function op, makes BOOLE return integer2.")
 
 (defconstant boole-c1  4
-  _N"Boole function op, makes BOOLE return complement of integer1.")
+  "Boole function op, makes BOOLE return complement of integer1.")
 
 (defconstant boole-c2  5
-  _N"Boole function op, makes BOOLE return complement of integer2.")
+  "Boole function op, makes BOOLE return complement of integer2.")
 
 (defconstant boole-and 6
-  _N"Boole function op, makes BOOLE return logand of integer1 and integer2.")
+  "Boole function op, makes BOOLE return logand of integer1 and integer2.")
 
 (defconstant boole-ior 7
-  _N"Boole function op, makes BOOLE return logior of integer1 and integer2.")
+  "Boole function op, makes BOOLE return logior of integer1 and integer2.")
 
 (defconstant boole-xor 8
-  _N"Boole function op, makes BOOLE return logxor of integer1 and integer2.")
+  "Boole function op, makes BOOLE return logxor of integer1 and integer2.")
 
 (defconstant boole-eqv 9
-  _N"Boole function op, makes BOOLE return logeqv of integer1 and integer2.")
+  "Boole function op, makes BOOLE return logeqv of integer1 and integer2.")
 
 (defconstant boole-nand  10
-  _N"Boole function op, makes BOOLE return log nand of integer1 and integer2.")
+  "Boole function op, makes BOOLE return log nand of integer1 and integer2.")
 
 (defconstant boole-nor   11
-  _N"Boole function op, makes BOOLE return lognor of integer1 and integer2.")
+  "Boole function op, makes BOOLE return lognor of integer1 and integer2.")
 
 (defconstant boole-andc1 12
-  _N"Boole function op, makes BOOLE return logandc1 of integer1 and integer2.")
+  "Boole function op, makes BOOLE return logandc1 of integer1 and integer2.")
 
 (defconstant boole-andc2 13
-  _N"Boole function op, makes BOOLE return logandc2 of integer1 and integer2.")
+  "Boole function op, makes BOOLE return logandc2 of integer1 and integer2.")
 
 (defconstant boole-orc1  14
-  _N"Boole function op, makes BOOLE return logorc1 of integer1 and integer2.")
+  "Boole function op, makes BOOLE return logorc1 of integer1 and integer2.")
 
 (defconstant boole-orc2  15
-  _N"Boole function op, makes BOOLE return logorc2 of integer1 and integer2.")
+  "Boole function op, makes BOOLE return logorc2 of integer1 and integer2.")
 
 
 (defun boole (op integer1 integer2)
-  _N"Bit-wise boolean function on two integers.  Function chosen by OP:
+  "Bit-wise boolean function on two integers.  Function chosen by OP:
 	0	BOOLE-CLR
 	1	BOOLE-SET
 	2	BOOLE-1
@@ -1430,7 +1430,7 @@ significant bit of INTEGER is bit 0."
 ;;;; GCD, LCM:
 
 (defun gcd (&rest numbers)
-  _N"Returns the greatest common divisor of the arguments, which must be
+  "Returns the greatest common divisor of the arguments, which must be
   integers.  Gcd with no arguments is defined to be 0."
   (cond ((null numbers) 0)
 	((null (cdr numbers)) (abs (the integer (car numbers))))
@@ -1443,7 +1443,7 @@ significant bit of INTEGER is bit 0."
 		    (list rest))))))
 
 (defun lcm (&rest numbers)
-  _N"Returns the least common multiple of one or more integers.  LCM of no
+  "Returns the least common multiple of one or more integers.  LCM of no
   arguments is defined to be 1."
   (cond ((null numbers) 1)
 	((null (cdr numbers)) (abs (the integer (car numbers))))
@@ -1515,7 +1515,7 @@ significant bit of INTEGER is bit 0."
 ;;; Primep  --  Public
 ;;;
 (defun primep (x)
-  _N"Returns T iff X is a positive prime integer."
+  "Returns T iff X is a positive prime integer."
   (declare (integer x))
   (if (<= x 5)
       (and (>= x 2) (/= x 4))
@@ -1534,7 +1534,7 @@ significant bit of INTEGER is bit 0."
 ;;;    From discussion on comp.lang.lisp and Akira Kurihara.
 ;;;
 (defun isqrt (n)
-  _N"Returns the root of the nearest integer less than n which is a perfect
+  "Returns the root of the nearest integer less than n which is a perfect
    square."
   (declare (type unsigned-byte n) (values unsigned-byte))
   ;; theoretically (> n 7) ,i.e., n-len-quarter > 0
@@ -1560,11 +1560,11 @@ significant bit of INTEGER is bit 0."
 
 (macrolet ((frob (name doc)
 	     `(defun ,name (number) ,doc (,name number))))
-  (frob zerop _N"Returns T if number = 0, NIL otherwise.")
-  (frob plusp _N"Returns T if number > 0, NIL otherwise.")
-  (frob minusp _N"Returns T if number < 0, NIL otherwise.")
-  (frob oddp _N"Returns T if number is odd, NIL otherwise.")
-  (frob evenp _N"Returns T if number is even, NIL otherwise."))
+  (frob zerop "Returns T if number = 0, NIL otherwise.")
+  (frob plusp "Returns T if number > 0, NIL otherwise.")
+  (frob minusp "Returns T if number < 0, NIL otherwise.")
+  (frob oddp "Returns T if number is odd, NIL otherwise.")
+  (frob evenp "Returns T if number is even, NIL otherwise."))
 
 
 ;;;; Modular arithmetic
diff --git a/code/package.lisp b/code/package.lisp
index 313f997c51773dece4957bcabb9f9b9348c8f5f6..73f971b5f26e76f6b25d341365e85747b1f0e5eb 100644
--- a/code/package.lisp
+++ b/code/package.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/package.lisp,v 1.78 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/package.lisp,v 1.79 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -42,7 +42,7 @@
 (sys:register-lisp-feature :relative-package-names)
 
 (defvar *default-package-use-list* '("COMMON-LISP")
-  _N"The list of packages to use by default of no :USE argument is supplied
+  "The list of packages to use by default of no :USE argument is supplied
    to MAKE-PACKAGE or other package creation forms.")
 
 ;;; INTERNAL conditions
@@ -56,7 +56,7 @@
 	     (lambda (package)
 	       (values `(package-or-lose ',(package-name package))
 		       nil))))
-  _N"Standard structure for the description of a package.  Consists of 
+  "Standard structure for the description of a package.  Consists of 
    a list of all hash tables, the name of the package, the nicknames of
    the package, the use-list for the package, the used-by- list, hash-
    tables for the internal and external symbols, and a list of the
@@ -122,7 +122,7 @@
   (frob package-used-by-list package-%used-by-list)
   (frob package-shadowing-symbols package-%shadowing-symbols))
 
-(defvar *package* () _N"The current package.")
+(defvar *package* () "The current package.")
 
 ;;; An equal hashtable from package names to packages.
 ;;;
@@ -278,7 +278,7 @@
 ;;;
 #+relative-package-names
 (defun package-parent (package-specifier)
-  _N"Given PACKAGE-SPECIFIER, a package, symbol or string, return the
+  "Given PACKAGE-SPECIFIER, a package, symbol or string, return the
   parent package.  If there is not a parent, signal an error."
   (declare (optimize (speed 3)))
   (flet ((find-last-dot (name)
@@ -310,7 +310,7 @@
 ;;;
 #+relative-package-names
 (defun package-children (package-specifier &key (recurse t))
-  _N"Given PACKAGE-SPECIFIER, a package, symbol or string, return all the
+  "Given PACKAGE-SPECIFIER, a package, symbol or string, return all the
   packages which are in the hierarchy 'under' the given package.  If
   :recurse is nil, then only return the immediate children of the package."
   (declare (optimize (speed 3)))
@@ -401,7 +401,7 @@
 ;;;
 ;;;
 (defun find-package (name)
-  _N"Find the package having the specified name."
+  "Find the package having the specified name."
   (if (packagep name)
       name
       (let ((name (package-namify name)))
@@ -663,7 +663,7 @@
 
 (defmacro do-symbols ((var &optional (package '*package*) result-form)
 		      &parse-body (body decls))
-  _N"DO-SYMBOLS (VAR [PACKAGE [RESULT-FORM]]) {DECLARATION}* {TAG | FORM}*
+  "DO-SYMBOLS (VAR [PACKAGE [RESULT-FORM]]) {DECLARATION}* {TAG | FORM}*
    Executes the FORMs at least once for each symbol accessible in the given
    PACKAGE with VAR bound to the current symbol."
   (let ((flet-name (gensym "DO-SYMBOLS-")))
@@ -697,7 +697,7 @@
 
 (defmacro do-external-symbols ((var &optional (package '*package*) result-form)
 			       &parse-body (body decls))
-  _N"DO-EXTERNAL-SYMBOLS (VAR [PACKAGE [RESULT-FORM]]) {DECL}* {TAG | FORM}*
+  "DO-EXTERNAL-SYMBOLS (VAR [PACKAGE [RESULT-FORM]]) {DECL}* {TAG | FORM}*
    Executes the FORMs once for each external symbol in the given PACKAGE with
    VAR bound to the current symbol."
   (let ((flet-name (gensym "DO-SYMBOLS-")))
@@ -721,7 +721,7 @@
 	 ,result-form))))
 
 (defmacro do-all-symbols ((var &optional result-form) &parse-body (body decls))
-  _N"DO-ALL-SYMBOLS (VAR [RESULT-FORM]) {DECLARATION}* {TAG | FORM}*
+  "DO-ALL-SYMBOLS (VAR [RESULT-FORM]) {DECLARATION}* {TAG | FORM}*
    Executes the FORMs once for each symbol in every package with VAR bound
    to the current symbol."
   (let ((flet-name (gensym "DO-SYMBOLS-")))
@@ -751,7 +751,7 @@
 
 (defmacro with-package-iterator ((mname package-list &rest symbol-types)
 				 &body body)
-  _N"Within the lexical scope of the body forms, MNAME is defined via macrolet
+  "Within the lexical scope of the body forms, MNAME is defined via macrolet
    such that successive invocations of (mname) will return the symbols,
    one by one, from the packages in PACKAGE-LIST. SYMBOL-TYPES may be
    any of :inherited :external :internal."
@@ -912,7 +912,7 @@
 ;;;; DEFPACKAGE:
 
 (defmacro defpackage (package &rest options)
-  _N"Defines a new package called PACKAGE.  Each of OPTIONS should be one of the
+  "Defines a new package called PACKAGE.  Each of OPTIONS should be one of the
    following:
      (:NICKNAMES {package-name}*)
      (:SIZE <integer>)
@@ -1137,7 +1137,7 @@
 ;;;
 (defun make-package (name &key (use *default-package-use-list*) nicknames
 			  (internal-symbols 10) (external-symbols 10))
-  _N"Makes a new package having the specified Name and Nicknames.  The
+  "Makes a new package having the specified Name and Nicknames.  The
   package will inherit all external symbols from each package in
   the use list.  :Internal-Symbols and :External-Symbols are
   estimates for the number of internal and external symbols which
@@ -1161,7 +1161,7 @@
 ;;;    Like Make-Package, only different.  Should go away someday.
 ;;;
 (defun old-in-package (name &rest keys &key nicknames use)
-  _N"Sets *PACKAGE* to package with given NAME, creating the package if
+  "Sets *PACKAGE* to package with given NAME, creating the package if
    it does not exist.  If the package already exists then it is modified
    to agree with the :USE and :NICKNAMES arguments.  Any new nicknames
    are added without removing any old ones not specified.  If any package
@@ -1205,7 +1205,7 @@
 ;;; add in any new ones.
 ;;;
 (defun rename-package (package name &optional (nicknames ()))
-  _N"Changes the name and nicknames for a package."
+  "Changes the name and nicknames for a package."
   (let* ((package (package-or-lose package))
 	 (name (string name))
 	 (found (find-package name)))
@@ -1226,7 +1226,7 @@
 ;;; Delete-Package -- Public
 ;;;
 (defun delete-package (package-or-name)
-  _N"Delete the PACKAGE-OR-NAME from the package system data structures."
+  "Delete the PACKAGE-OR-NAME from the package system data structures."
   (let ((package (if (packagep package-or-name)
 		     package-or-name
 		     (find-package package-or-name))))
@@ -1266,7 +1266,7 @@
 ;;;
 ;;;
 (defun list-all-packages ()
-  _N"Returns a list of all existing packages."
+  "Returns a list of all existing packages."
   (let ((res ()))
     (maphash #'(lambda (k v)
 		 (declare (ignore k))
@@ -1279,7 +1279,7 @@
 ;;;    Simple-stringify the name and call intern*.
 ;;;
 (defun intern (name &optional package)
-  _N"Returns a symbol having the specified name, creating it if necessary."
+  "Returns a symbol having the specified name, creating it if necessary."
   (let ((name (string-to-nfc name))
         (package (if package (package-or-lose package) *package*)))
     (declare (type simple-string name))
@@ -1290,7 +1290,7 @@
 ;;;    Ditto.
 ;;;
 (defun find-symbol (name &optional package)
-  _N"Returns the symbol NAME in PACKAGE.  If such a symbol is found
+  "Returns the symbol NAME in PACKAGE.  If such a symbol is found
   then the second value is :internal, :external or :inherited to indicate
   how the symbol is accessible.  If no symbol is found then both values
   are NIL."
@@ -1387,7 +1387,7 @@
 ;;; result, otherwise just nuke the symbol.
 ;;;
 (defun unintern (symbol &optional (package *package*))
-  _N"Makes SYMBOL no longer present in PACKAGE.  If SYMBOL was present
+  "Makes SYMBOL no longer present in PACKAGE.  If SYMBOL was present
   then T is returned, otherwise NIL.  If PACKAGE is SYMBOL's home
   package, then it is made uninterned."
   (let* ((package (package-or-lose package))
@@ -1494,7 +1494,7 @@
 ;;;    Do more stuff.
 ;;;
 (defun export (symbols &optional (package *package*))
-  _N"Exports SYMBOLS from PACKAGE, checking that no name conflicts result."
+  "Exports SYMBOLS from PACKAGE, checking that no name conflicts result."
   (let ((package (package-or-lose package))
 	(syms ()))
     ;;
@@ -1573,7 +1573,7 @@
 ;;; internal.
 ;;;
 (defun unexport (symbols &optional (package *package*))
-  _N"Makes SYMBOLS no longer exported from PACKAGE."
+  "Makes SYMBOLS no longer exported from PACKAGE."
   (let ((package (package-or-lose package))
 	(syms ()))
     (when *enable-package-locked-errors*
@@ -1616,7 +1616,7 @@
 ;;; shadowing-import if there is.
 ;;;
 (defun import (symbols &optional (package *package*))
-  _N"Make SYMBOLS accessible as internal symbols in PACKAGE.  If a symbol
+  "Make SYMBOLS accessible as internal symbols in PACKAGE.  If a symbol
   is already accessible then it has no effect.  If a name conflict
   would result from the importation, then a correctable error is signalled."
   (let ((package (package-or-lose package))
@@ -1659,7 +1659,7 @@
 ;;; stick the symbol in.
 ;;;
 (defun shadowing-import (symbols &optional (package *package*))
-  _N"Import SYMBOLS into PACKAGE, disregarding any name conflict.  If
+  "Import SYMBOLS into PACKAGE, disregarding any name conflict.  If
   a symbol of the same name is present, then it is uninterned.
   The symbols are added to the Package-Shadowing-Symbols."
   (let* ((package (package-or-lose package))
@@ -1682,7 +1682,7 @@
 ;;;
 ;;;
 (defun shadow (symbols &optional (package *package*))
-  _N"Make an internal symbol in PACKAGE with the same name as each of the
+  "Make an internal symbol in PACKAGE with the same name as each of the
   specified SYMBOLS, adding the new symbols to the Package-Shadowing-Symbols.
   If a symbol with the given name is already present in PACKAGE, then
   the existing symbol is placed in the shadowing symbols list if it is
@@ -1707,7 +1707,7 @@
 ;;; checking.
 ;;;
 (defun use-package (packages-to-use &optional (package *package*))
-  _N"Add all the PACKAGES-TO-USE to the use list for PACKAGE so that
+  "Add all the PACKAGES-TO-USE to the use list for PACKAGE so that
   the external symbols of the used packages are accessible as internal
   symbols in PACKAGE."
   (let ((packages (package-listify packages-to-use))
@@ -1770,7 +1770,7 @@
 ;;;
 ;;;
 (defun unuse-package (packages-to-unuse &optional (package *package*))
-  _N"Remove PACKAGES-TO-UNUSE from the use list for PACKAGE."
+  "Remove PACKAGES-TO-UNUSE from the use list for PACKAGE."
   (let ((package (package-or-lose package)))
     (dolist (p (package-listify packages-to-unuse))
       (setf (package-%use-list package)
@@ -1786,7 +1786,7 @@
 ;;;
 ;;;
 (defun find-all-symbols (string-or-symbol)
-  _N"Return a list of all symbols in the system having the specified name."
+  "Return a list of all symbols in the system having the specified name."
   (let ((string (string string-or-symbol))
 	(res ()))
     (maphash #'(lambda (k v)
@@ -1885,7 +1885,7 @@
 ;;; MAP-APROPOS -- public (extension).
 ;;;
 (defun map-apropos (fun string &optional package external-only)
-  _N"Call FUN with each symbol that contains STRING.
+  "Call FUN with each symbol that contains STRING.
   If PACKAGE is supplied then only use symbols present in
   that package.  If EXTERNAL-ONLY is true then only use
   symbols exported from the specified package."
@@ -1909,7 +1909,7 @@
 ;;; APROPOS -- public.
 ;;; 
 (defun apropos (string &optional package)
-  _N"Briefly describe all symbols which contain the specified STRING.
+  "Briefly describe all symbols which contain the specified STRING.
   If PACKAGE is supplied then only describe symbols present in
   that package.  If EXTERNAL-ONLY is non-NIL then only describe
   external symbols in the specified package."
@@ -1919,7 +1919,7 @@
 ;;; APROPOS-LIST -- public.
 ;;; 
 (defun apropos-list (string &optional package)
-  _N"Identical to APROPOS, except that it returns a list of the symbols
+  "Identical to APROPOS, except that it returns a list of the symbols
   found instead of describing them."
   (collect ((result))
     (map-apropos #'(lambda (symbol)
diff --git a/code/parse-time.lisp b/code/parse-time.lisp
index e3d3706613f7fa163bd861e9f1a7656fdd1380d5..18be2dc4aec1518daa899a8f95b92a850475debe 100644
--- a/code/parse-time.lisp
+++ b/code/parse-time.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/parse-time.lisp,v 1.19 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/parse-time.lisp,v 1.20 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 
@@ -27,7 +27,7 @@
 (defconstant date-time-dividers '(#\T #\t))
 
 (defvar *error-on-mismatch* nil
-  _N"If t, an error will be signalled if parse-time is unable
+  "If t, an error will be signalled if parse-time is unable
    to determine the time/date format of the string.")
 
 ;;; Set up hash tables for month, weekday, zone, and special strings.
@@ -714,7 +714,7 @@
 			       (default-hours nil) (default-day nil)
 			       (default-month nil) (default-year nil)
 			       (default-zone nil) (default-weekday -1))
-  _N"Tries very hard to make sense out of the argument time-string and
+  "Tries very hard to make sense out of the argument time-string and
    returns a single integer representing the universal time if
    successful.  If not, it returns nil.  If the :error-on-mismatch
    keyword is true, parse-time will signal an error instead of
diff --git a/code/pathname.lisp b/code/pathname.lisp
index 4dc3cfe7f3d8a774e9e02ca1e0365b59c4458b74..dd8ca4ee39a703087da3b87410ea55a1e9fe469b 100644
--- a/code/pathname.lisp
+++ b/code/pathname.lisp
@@ -4,7 +4,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.90 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.91 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -34,7 +34,7 @@
 (in-package "LISP")
 
 (defvar *autoload-translations* nil
-  _N"When non-nil, attempt to load \"library:<host>.translations\" to resolve
+  "When non-nil, attempt to load \"library:<host>.translations\" to resolve
    an otherwise undefined logical host.")
 							    
 
@@ -283,7 +283,7 @@
 ;;; PATH-DESIGNATOR -- internal type
 ;;;
 (deftype path-designator ()
-  _N"A path specification, either a string, file-stream or pathname."
+  "A path specification, either a string, file-stream or pathname."
   ;; This used to be stream, not file-stream, but ANSI CL says a
   ;; pathname designator is a string, a pathname or a stream
   ;; associated with a file.  In the places we use path-designator, we
@@ -530,7 +530,7 @@
 ;;; PATHNAME -- Interface
 ;;;
 (defun pathname (thing)
-  _N"Convert thing (a pathname, string or stream) into a pathname."
+  "Convert thing (a pathname, string or stream) into a pathname."
   (declare (type path-designator thing))
   (with-pathname (pathname thing)
     pathname))
@@ -632,7 +632,7 @@
 			&optional
 			(defaults *default-pathname-defaults*)
 			(default-version :newest))
-  _N"Construct a filled in pathname by completing the unspecified components
+  "Construct a filled in pathname by completing the unspecified components
    from the defaults."
   (declare (type path-designator pathname)
 	   (type path-designator defaults)
@@ -711,7 +711,7 @@
 			   (version nil versionp)
 			   defaults
 			   (case :local))
-  _N"Makes a new pathname from the component arguments.  Note that host is
+  "Makes a new pathname from the component arguments.  Note that host is
 a host-structure or string."
   (declare (type (or null string host component-tokens) host)
 	   (type (or string component-tokens) device)
@@ -864,7 +864,7 @@ a host-structure or string."
 ;;; PATHNAME-HOST -- Interface
 ;;;
 (defun pathname-host (pathname &key (case :local))
-  _N"Accessor for the pathname's host."
+  "Accessor for the pathname's host."
   (declare (type path-designator pathname)
 	   (type (member :local :common) case)
 	   (values (or string null))
@@ -874,7 +874,7 @@ a host-structure or string."
 ;;; PATHNAME-DEVICE -- Interface
 ;;;
 (defun pathname-device (pathname &key (case :local))
-  _N"Accessor for pathname's device."
+  "Accessor for pathname's device."
   (declare (type path-designator pathname)
 	   (type (member :local :common) case))
   (with-pathname (pathname pathname)
@@ -887,7 +887,7 @@ a host-structure or string."
 ;;; PATHNAME-DIRECTORY -- Interface
 ;;;
 (defun pathname-directory (pathname &key (case :local))
-  _N"Accessor for the pathname's directory list."
+  "Accessor for the pathname's directory list."
   (declare (type path-designator pathname)
 	   (type (member :local :common) case))
   (with-pathname (pathname pathname)
@@ -908,7 +908,7 @@ a host-structure or string."
 ;;; PATHNAME-NAME -- Interface
 ;;;
 (defun pathname-name (pathname &key (case :local))
-  _N"Accessor for the pathname's name."
+  "Accessor for the pathname's name."
   (declare (type path-designator pathname)
 	   (type (member :local :common) case))
   (with-pathname (pathname pathname)
@@ -921,7 +921,7 @@ a host-structure or string."
 ;;; PATHNAME-TYPE
 ;;;
 (defun pathname-type (pathname &key (case :local))
-  _N"Accessor for the pathname's name."
+  "Accessor for the pathname's name."
   (declare (type path-designator pathname)
 	   (type (member :local :common) case))
   (with-pathname (pathname pathname)
@@ -934,7 +934,7 @@ a host-structure or string."
 ;;; PATHNAME-VERSION
 ;;;
 (defun pathname-version (pathname)
-  _N"Accessor for the pathname's version."
+  "Accessor for the pathname's version."
   (declare (type path-designator pathname))
   (with-pathname (pathname pathname)
     (%pathname-version pathname)))
@@ -1022,7 +1022,7 @@ a host-structure or string."
 (defun parse-namestring (thing
 			 &optional host (defaults *default-pathname-defaults*)
 			 &key (start 0) end junk-allowed)
-  _N"Converts pathname, a pathname designator, into a pathname structure,
+  "Converts pathname, a pathname designator, into a pathname structure,
    for a physical pathname, returns the printed representation. Host may be
    a physical host structure or host namestring."
   (declare (type path-designator thing)
@@ -1109,7 +1109,7 @@ a host-structure or string."
 ;;; NAMESTRING -- Interface
 ;;;
 (defun namestring (pathname)
-  _N"Construct the full (name)string form of the pathname."
+  "Construct the full (name)string form of the pathname."
   (declare (type path-designator pathname)
 	   (values (or null simple-base-string)))
   (with-pathname (pathname pathname)
@@ -1130,7 +1130,7 @@ a host-structure or string."
 ;;; HOST-NAMESTRING -- Interface
 ;;;
 (defun host-namestring (pathname)
-  _N"Returns a string representation of the name of the host in the pathname."
+  "Returns a string representation of the name of the host in the pathname."
   (declare (type path-designator pathname)
 	   (values (or null simple-base-string)))
   (with-pathname (pathname pathname)
@@ -1144,7 +1144,7 @@ a host-structure or string."
 ;;; DIRECTORY-NAMESTRING -- Interface
 ;;;
 (defun directory-namestring (pathname)
-  _N"Returns a string representation of the directories used in the pathname."
+  "Returns a string representation of the directories used in the pathname."
   (declare (type path-designator pathname)
 	   (values (or null simple-base-string)))
   (with-pathname (pathname pathname)
@@ -1158,7 +1158,7 @@ a host-structure or string."
 ;;; FILE-NAMESTRING -- Interface
 ;;;
 (defun file-namestring (pathname)
-  _N"Returns a string representation of the name used in the pathname."
+  "Returns a string representation of the name used in the pathname."
   (declare (type path-designator pathname)
 	   (values (or null simple-base-string)))
   (with-pathname (pathname pathname)
@@ -1173,7 +1173,7 @@ a host-structure or string."
 ;;;
 (defun enough-namestring (pathname
 			  &optional (defaults *default-pathname-defaults*))
-  _N"Returns an abbreviated pathname sufficent to identify the pathname relative
+  "Returns an abbreviated pathname sufficent to identify the pathname relative
    to the defaults."
   (declare (type path-designator pathname defaults))
   (with-pathname (pathname pathname)
@@ -1196,7 +1196,7 @@ a host-structure or string."
 ;;; WILD-PATHNAME-P -- Interface
 ;;;
 (defun wild-pathname-p (pathname &optional field-key)
-  _N"Predicate for determining whether pathname contains any wildcards."
+  "Predicate for determining whether pathname contains any wildcards."
   (declare (type path-designator pathname)
 	   (type (member nil :host :device :directory :name :type :version)
 		 field-key))
@@ -1222,7 +1222,7 @@ a host-structure or string."
 ;;; PATHNAME-MATCH-P -- Interface
 ;;;
 (defun pathname-match-p (in-pathname in-wildname)
-  _N"Pathname matches the wildname template?"
+  "Pathname matches the wildname template?"
   (declare (type path-designator in-pathname)
 	   ;; Not path-designator because a file-stream can't have a
 	   ;; wild pathname.
@@ -1467,7 +1467,7 @@ a host-structure or string."
 ;;; TRANSLATE-PATHNAME -- Interface
 ;;;
 (defun translate-pathname (source from-wildname to-wildname &key)
-  _N"Use the source pathname to translate the from-wildname's wild and
+  "Use the source pathname to translate the from-wildname's wild and
    unspecified elements into a completed to-pathname based on the to-wildname."
   (declare (type path-designator source from-wildname to-wildname))
   (with-pathname (source source)
@@ -1559,7 +1559,7 @@ a host-structure or string."
 ;;; out the expansions and set defined to NIL.
 ;;; 
 (defun clear-search-list (name)
-  _N"Clear the current definition for the search-list NAME.  Returns T if such
+  "Clear the current definition for the search-list NAME.  Returns T if such
    a definition existed, and NIL if not."
   (let* ((name (string-downcase name))
 	 (search-list (gethash name *search-lists*)))
@@ -1574,7 +1574,7 @@ a host-structure or string."
 ;;; just mark them as being undefined.
 ;;;
 (defun clear-all-search-lists ()
-  _N"Clear the definition for all search-lists.  Only use this if you know
+  "Clear the definition for all search-lists.  Only use this if you know
    what you are doing."
   (maphash #'(lambda (name search-list)
 	       (declare (ignore name))
@@ -1606,7 +1606,7 @@ a host-structure or string."
 ;;; bunch of pathnames.
 ;;; 
 (defun search-list (pathname)
-  _N"Return the expansions for the search-list starting PATHNAME.  If PATHNAME
+  "Return the expansions for the search-list starting PATHNAME.  If PATHNAME
    does not start with a search-list, then an error is signaled.  If
    the search-list has not been defined yet, then an error is signaled.
    The expansion for a search-list can be set with SETF." 
@@ -1623,7 +1623,7 @@ a host-structure or string."
 ;;; SEARCH-LIST-DEFINED-P -- public.
 ;;; 
 (defun search-list-defined-p (pathname)
-  _N"Returns T if the search-list starting PATHNAME is currently defined, and
+  "Returns T if the search-list starting PATHNAME is currently defined, and
    NIL otherwise.  An error is signaled if PATHNAME does not start with a
    search-list."
   (with-pathname (pathname pathname)
@@ -1677,7 +1677,7 @@ a host-structure or string."
 ;;; ENUMERATE-SEARCH-LIST -- public.
 ;;; 
 (defmacro enumerate-search-list ((var pathname &optional result) &body body)
-  _N"Execute BODY with VAR bound to each successive possible expansion for
+  "Execute BODY with VAR bound to each successive possible expansion for
    PATHNAME and then return RESULT.  Note: if PATHNAME does not contain a
    search-list, then BODY is executed exactly once.  Everything is wrapped
    in a block named NIL, so RETURN can be used to terminate early.  Note:
@@ -1963,7 +1963,7 @@ a host-structure or string."
 ;;; LOGICAL-PATHNAME -- Public
 ;;;
 (defun logical-pathname (pathspec)
-  _N"Converts the pathspec argument to a logical-pathname and returns it."
+  "Converts the pathspec argument to a logical-pathname and returns it."
   (declare (type (or logical-pathname string stream) pathspec)
 	   (values logical-pathname))
   (if (typep pathspec 'logical-pathname)
@@ -2101,7 +2101,7 @@ a host-structure or string."
 ;;; LOGICAL-PATHNAME-TRANSLATIONS -- Public
 ;;;
 (defun logical-pathname-translations (host)
-  _N"Return the (logical) host object argument's list of translations."
+  "Return the (logical) host object argument's list of translations."
   (declare (type (or string logical-host) host)
 	   (values list))
   (logical-host-translations (find-logical-host host)))
@@ -2109,7 +2109,7 @@ a host-structure or string."
 ;;; (SETF LOGICAL-PATHNAME-TRANSLATIONS) -- Public
 ;;;
 (defun (setf logical-pathname-translations) (translations host)
-  _N"Set the translations list for the logical host argument.
+  "Set the translations list for the logical host argument.
    Return translations."
   (declare (type (or string logical-host) host)
 	   (type list translations)
@@ -2135,7 +2135,7 @@ a host-structure or string."
 ;;; LOAD-LOGICAL-PATHNAME-TRANSLATIONS -- Public
 ;;;
 (defun load-logical-pathname-translations (host)
-  _N"Search for a logical pathname named host, if not already defined. If already
+  "Search for a logical pathname named host, if not already defined. If already
    defined no attempt to find or load a definition is attempted and NIL is
    returned. If host is not already defined, but definition is found and loaded
    successfully, T is returned, else error."
@@ -2157,7 +2157,7 @@ a host-structure or string."
 ;;; TRANSLATE-LOGICAL-PATHNAME  -- Public
 ;;;
 (defun translate-logical-pathname (pathname &key)
-  _N"Translates pathname to a physical pathname, which is returned."
+  "Translates pathname to a physical pathname, which is returned."
   (declare (type path-designator pathname)
 	   (values (or null pathname)))
   (typecase pathname
diff --git a/code/ppc-vm.lisp b/code/ppc-vm.lisp
index 971e4475d99b44c7b73b9a04badc98f39b9ee4e4..dfe8ce74ea628133263810d6ba5f961cb140b40e 100644
--- a/code/ppc-vm.lisp
+++ b/code/ppc-vm.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/ppc-vm.lisp,v 1.10 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/ppc-vm.lisp,v 1.11 2010/04/19 02:18:04 rtoy Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -112,11 +112,11 @@
 ;;;; MACHINE-TYPE and MACHINE-VERSION
 
 (defun machine-type ()
-  _N"Returns a string describing the type of the local machine."
+  "Returns a string describing the type of the local machine."
   "PowerPC")
 
 (defun machine-version ()
-  _N"Returns a string describing the version of the local machine."
+  "Returns a string describing the version of the local machine."
   "who-knows?")
 
 
@@ -361,12 +361,12 @@
 ;; compiler will normally use vops to implement these functions.
 
 (defun fused-multiply-subtract (x y z)
-  _N"Compute x*y-z with only one rounding operation"
+  "Compute x*y-z with only one rounding operation"
   (declare (double-float x y z))
   (fused-multiply-subtract x y z))
 
 (defun fused-multiply-add (x y z)
-  _N"Compute x*y+z with only one rounding operation"
+  "Compute x*y+z with only one rounding operation"
   (declare (double-float x y z))
   (fused-multiply-add x y z))
 
diff --git a/code/pprint.lisp b/code/pprint.lisp
index 254367acbe0fa0285ea61cd0e448a8b83de51d1b..4d4933ce42087fe4906cc17ef4543dce0bcf2fb1 100644
--- a/code/pprint.lisp
+++ b/code/pprint.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pprint.lisp,v 1.67 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pprint.lisp,v 1.68 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -501,7 +501,7 @@
   (record))
 
 (defun enqueue-annotation (stream handler record)
-  _N"Insert an annotation into the pretty-printing stream STREAM.
+  "Insert an annotation into the pretty-printing stream STREAM.
 HANDLER is a function, and RECORD is an arbitrary datum.  The
 pretty-printing stream conceptionally queues annotations in sequence
 with the characters that are printed to the stream, until the stream
@@ -517,7 +517,7 @@ with the arguments RECORD, STREAM and nil."
 	   :record record))
 
 (defun re-enqueue-annotation (stream annotation)
-  _N"Insert ANNOTATION into the queue of annotations in STREAM."
+  "Insert ANNOTATION into the queue of annotations in STREAM."
   (let* ((annotation-cons (list annotation))
 	 (head (pretty-stream-annotations-head stream)))
     (if head
@@ -526,7 +526,7 @@ with the arguments RECORD, STREAM and nil."
     (setf (pretty-stream-annotations-head stream) annotation-cons)))
 
 (defun re-enqueue-annotations (stream end)
-  _N"Insert all annotations in STREAM from the queue of pending
+  "Insert all annotations in STREAM from the queue of pending
 operations into the queue of annotations.  When END is non-nil, 
 stop before reaching the queued-op END."
   #-(and)
@@ -541,7 +541,7 @@ stop before reaching the queued-op END."
       (re-enqueue-annotation stream (car tail)))))
 
 (defun dequeue-annotation (stream &key end-posn)
-  _N"Dequeue the next annotation from the queue of annotations of STREAM
+  "Dequeue the next annotation from the queue of annotations of STREAM
 and return it.  Return nil if there are no more annotations.  When
 :END-POSN is given and the next annotation has a posn greater than
 this, also return nil."
@@ -562,7 +562,7 @@ this, also return nil."
 	     truncatep)))
 
 (defun output-buffer-with-annotations (stream end)
-  _N"Output the buffer of STREAM up to (excluding) the buffer index END.
+  "Output the buffer of STREAM up to (excluding) the buffer index END.
 When annotations are present, invoke them at the right positions."
   (let ((target (pretty-stream-target stream))
 	(buffer (pretty-stream-buffer stream))
@@ -592,7 +592,7 @@ When annotations are present, invoke them at the right positions."
     (write-string buffer target :start start :end end)))
 
 (defun flush-annotations (stream end truncatep)
-  _N"Invoke all annotations in STREAM up to (including) the buffer index END."
+  "Invoke all annotations in STREAM up to (including) the buffer index END."
   (let ((end-posn (index-posn end stream)))
     #-(and)
     (loop
@@ -837,7 +837,7 @@ When annotations are present, invoke them at the right positions."
 (defmacro pprint-logical-block
 	  ((stream-symbol object &key (prefix "" prefix-p) (per-line-prefix nil per-line-p) (suffix "" suffix-p))
 	   &body body)
-  _N"Group some output into a logical block.  STREAM-SYMBOL should be either a
+  "Group some output into a logical block.  STREAM-SYMBOL should be either a
    stream, T (for *TERMINAL-IO*), or NIL (for *STANDARD-OUTPUT*).  The printer
    control variable *PRINT-LEVEL* is automatically handled."
   (when (and prefix-p per-line-prefix)
@@ -915,7 +915,7 @@ When annotations are present, invoke them at the right positions."
 	 ,body))))
 
 (defmacro pprint-exit-if-list-exhausted ()
-  _N"Cause the closest enclosing use of PPRINT-LOGICAL-BLOCK to return
+  "Cause the closest enclosing use of PPRINT-LOGICAL-BLOCK to return
    if it's list argument is exhausted.  Can only be used inside
    PPRINT-LOGICAL-BLOCK, and only when the LIST argument to
    PPRINT-LOGICAL-BLOCK is supplied."
@@ -923,7 +923,7 @@ When annotations are present, invoke them at the right positions."
 	  PPRINT-LOGICAL-BLOCK."))
 
 (defmacro pprint-pop ()
-  _N"Return the next element from LIST argument to the closest enclosing
+  "Return the next element from LIST argument to the closest enclosing
    use of PPRINT-LOGICAL-BLOCK, automatically handling *PRINT-LENGTH*
    and *PRINT-CIRCLE*.  Can only be used inside PPRINT-LOGICAL-BLOCK.
    If the LIST argument to PPRINT-LOGICAL-BLOCK was NIL, then nothing
@@ -931,7 +931,7 @@ When annotations are present, invoke them at the right positions."
   (error _"PPRINT-POP must be lexically inside PPRINT-LOGICAL-BLOCK."))
   
 (defun pprint-newline (kind &optional stream)
-  _N"Output a conditional newline to STREAM (which defaults to
+  "Output a conditional newline to STREAM (which defaults to
    *STANDARD-OUTPUT*) if it is a pretty-printing stream, and do
    nothing if not.  KIND can be one of:
      :LINEAR - A line break is inserted if and only if the immediatly
@@ -961,7 +961,7 @@ When annotations are present, invoke them at the right positions."
   nil)
 
 (defun pprint-indent (relative-to n &optional stream)
-  _N"Specify the indentation to use in the current logical block if STREAM
+  "Specify the indentation to use in the current logical block if STREAM
    (which defaults to *STANDARD-OUTPUT*) is a pretty-printing stream
    and do nothing if not.  (See PPRINT-LOGICAL-BLOCK.)  N is the indention
    to use (in ems, the width of an ``m'') and RELATIVE-TO can be either:
@@ -985,7 +985,7 @@ When annotations are present, invoke them at the right positions."
   nil)
 
 (defun pprint-tab (kind colnum colinc &optional stream)
-  _N"If STREAM (which defaults to *STANDARD-OUTPUT*) is a pretty-printing
+  "If STREAM (which defaults to *STANDARD-OUTPUT*) is a pretty-printing
    stream, perform tabbing based on KIND, otherwise do nothing.  KIND can
    be one of:
      :LINE - Tab to column COLNUM.  If already past COLNUM tab to the next
@@ -1009,7 +1009,7 @@ When annotations are present, invoke them at the right positions."
   nil)
 
 (defun pprint-fill (stream list &optional (colon? t) atsign?)
-  _N"Output LIST to STREAM putting :FILL conditional newlines between each
+  "Output LIST to STREAM putting :FILL conditional newlines between each
    element.  If COLON? is NIL (defaults to T), then no parens are printed
    around the output.  ATSIGN? is ignored (but allowed so that PPRINT-FILL
    can be used with the ~/.../ format directive."
@@ -1025,7 +1025,7 @@ When annotations are present, invoke them at the right positions."
       (pprint-newline :fill stream))))
 
 (defun pprint-linear (stream list &optional (colon? t) atsign?)
-  _N"Output LIST to STREAM putting :LINEAR conditional newlines between each
+  "Output LIST to STREAM putting :LINEAR conditional newlines between each
    element.  If COLON? is NIL (defaults to T), then no parens are printed
    around the output.  ATSIGN? is ignored (but allowed so that PPRINT-LINEAR
    can be used with the ~/.../ format directive."
@@ -1041,7 +1041,7 @@ When annotations are present, invoke them at the right positions."
       (pprint-newline :linear stream))))
 
 (defun pprint-tabular (stream list &optional (colon? t) atsign? tabsize)
-  _N"Output LIST to STREAM tabbing to the next column that is an even multiple
+  "Output LIST to STREAM tabbing to the next column that is an even multiple
    of TABSIZE (which defaults to 16) between each element.  :FILL style
    conditional newlines are also output between each element.  If COLON? is
    NIL (defaults to T), then no parens are printed around the output.
diff --git a/code/pred.lisp b/code/pred.lisp
index 0a4da401dcd57ce297ed5585dde5c9a525a059a5..95c678cdd21ade97446b09f404eafbf499a0f560 100644
--- a/code/pred.lisp
+++ b/code/pred.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pred.lisp,v 1.63 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pred.lisp,v 1.64 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -138,7 +138,7 @@
 ;;; it is not permitted to return member types.
 ;;; 
 (defun type-of (object)
-  _N"Return the type of OBJECT."
+  "Return the type of OBJECT."
   (typecase object
     ((or array complex)
      (type-specifier (ctype-of object)))
@@ -167,7 +167,7 @@
 ;;;; UPGRADED-ARRAY-ELEMENT-TYPE  --  public
 ;;;
 (defun upgraded-array-element-type (spec &optional environment)
-  _N"Return the element type that will actually be used to implement an array
+  "Return the element type that will actually be used to implement an array
    with the specifier :ELEMENT-TYPE Spec."
   ;; Type expansion (TYPE-EXPAND) currently doesn't handle environments.
   (declare (ignore environment))
@@ -180,7 +180,7 @@
 ;;; Just parse the type specifiers and call csubtype.
 ;;; 
 (defun subtypep (type1 type2 &optional environment)
-  _N"Return two values indicating the relationship between type1 and type2:
+  "Return two values indicating the relationship between type1 and type2:
   T and T: type1 definitely is a subtype of type2.
   NIL and T: type1 definitely is not a subtype of type2.
   NIL and NIL: who knows?"
@@ -197,7 +197,7 @@
 ;;; Just call %typep
 ;;; 
 (defun typep (object type &optional environment)
-  _N"Return T iff OBJECT is of type TYPE."
+  "Return T iff OBJECT is of type TYPE."
   (declare (ignore environment))
   (%typep object type))
 
@@ -378,14 +378,14 @@
 ;;; 
 
 (defun eq (obj1 obj2)
-  _N"Return T if OBJ1 and OBJ2 are the same object, otherwise NIL."
+  "Return T if OBJ1 and OBJ2 are the same object, otherwise NIL."
   (eq obj1 obj2))
 
 
 ;;; EQUAL -- public.
 ;;;
 (defun equal (x y)
-  _N"Returns T if X and Y are EQL or if they are structured components
+  "Returns T if X and Y are EQL or if they are structured components
   whose elements are EQUAL.  Strings and bit-vectors are EQUAL if they
   are the same length and have indentical components.  Other arrays must be
   EQ to be EQUAL."
@@ -414,7 +414,7 @@
 ;;; EQUALP -- public.
 ;;; 
 (defun equalp (x y)
-  _N"Just like EQUAL, but more liberal in several respects.
+  "Just like EQUAL, but more liberal in several respects.
   Numbers may be of different types, as long as the values are identical
   after coercion.  Characters may differ in alphabetic case.  Vectors and
   arrays must have identical dimensions and EQUALP elements, but may differ
diff --git a/code/print.lisp b/code/print.lisp
index 3ea77a7bc7fb6624afb72297c7b07aa74ad0c679..1ea4a7081faae98bbd85687fb590d7485e1fd925 100644
--- a/code/print.lisp
+++ b/code/print.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/print.lisp,v 1.129 2010/04/16 12:54:53 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/print.lisp,v 1.130 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -300,7 +300,7 @@
 ;;; This is used in other files, but is defined in this one for some reason.
 
 (defun whitespace-char-p (char)
-  _N"Determines whether or not the character is considered whitespace."
+  "Determines whether or not the character is considered whitespace."
   (or (char= char #\space)
       (char= char #\tab)
       (char= char #\return)
@@ -332,7 +332,7 @@
 ;;; CHECK-FOR-CIRCULARITY -- interface.
 ;;;
 (defun check-for-circularity (object &optional assign (mode t))
-  _N"Check to see if OBJECT is a circular reference, and return something non-NIL
+  "Check to see if OBJECT is a circular reference, and return something non-NIL
    if it is.  If ASSIGN is T, then the number to use in the #n= and #n# noise
    is assigned at this time.  Note: CHECK-FOR-CIRCULARITY must be called
    *EXACTLY* once with ASSIGN T, or the circularity detection noise will get
@@ -419,7 +419,7 @@
 ;;; HANDLE-CIRCULARITY -- interface.
 ;;; 
 (defun handle-circularity (marker stream)
-  _N"Handle the results of CHECK-FOR-CIRCULARITY.  If this returns T then
+  "Handle the results of CHECK-FOR-CIRCULARITY.  If this returns T then
    you should go ahead and print the object.  If it returns NIL, then
    you should blow it off."
   (case marker
@@ -472,13 +472,13 @@
 ;;; *CURRENT-LEVEL* -- interface.
 ;;; 
 (defvar *current-level* 0
-  _N"The current level we are printing at, to be compared against *PRINT-LEVEL*.
+  "The current level we are printing at, to be compared against *PRINT-LEVEL*.
    See the macro DESCEND-INTO for a handy interface to depth abbreviation.")
 
 ;;; DESCEND-INTO -- interface.
 ;;; 
 (defmacro descend-into ((stream) &body body)
-  _N"Automatically handle *print-level* abbreviation.  If we are too deep, then
+  "Automatically handle *print-level* abbreviation.  If we are too deep, then
    a # is printed to STREAM and BODY is ignored."
   (let ((flet-name (gensym)))
     `(flet ((,flet-name ()
@@ -494,7 +494,7 @@
 ;;; PUNT-IF-TOO-LONG -- interface.
 ;;; 
 (defmacro punt-if-too-long (index stream)
-  _N"Punt if INDEX is equal or larger then *PRINT-LENGTH* (and *PRINT-READABLY*
+  "Punt if INDEX is equal or larger then *PRINT-LENGTH* (and *PRINT-READABLY*
    is NIL) by outputting \"...\" and returning from the block named NIL."
   `(when (and (not *print-readably*)
 	      *print-length*
@@ -508,14 +508,14 @@
 ;;; *PRETTY-PRINTER* -- public.
 ;;; 
 (defvar *pretty-printer* nil
-  _N"The current pretty printer.  Should be either a function that takes two
+  "The current pretty printer.  Should be either a function that takes two
    arguments (the object and the stream) or NIL to indicate that there is
    no pretty printer installed.")
 
 ;;; OUTPUT-OBJECT -- interface.
 ;;; 
 (defun output-object (object stream)
-  _N"Output OBJECT to STREAM observing all printer control variables."
+  "Output OBJECT to STREAM observing all printer control variables."
   (labels ((print-it (stream)
 	     (if *print-pretty*
 		 (if *pretty-printer*
@@ -560,7 +560,7 @@
 ;;; OUTPUT-UGLY-OBJECT -- interface.
 ;;; 
 (defun output-ugly-object (object stream)
-  _N"Output OBJECT to STREAM observing all printer control variables except
+  "Output OBJECT to STREAM observing all printer control variables except
    for *PRINT-PRETTY*.  Note: if *PRINT-PRETTY* is non-NIL, then the pretty
    printer will be used for any components of OBJECT, just not for OBJECT
    itself."
@@ -1149,7 +1149,7 @@
 	  (write-char char stream))))))
 
 (defun output-array (array stream)
-  _N"Outputs the printed representation of any array in either the #< or #A
+  "Outputs the printed representation of any array in either the #< or #A
    form."
   (if (or *print-array* *print-readably*)
       (output-array-guts array stream)
@@ -1333,7 +1333,7 @@
   big)
 
 (defun power-list (n r)
-  _N"Compute a list of pairs (2^i . r^{2^i}), stopping with the largest r^{2^i}
+  "Compute a list of pairs (2^i . r^{2^i}), stopping with the largest r^{2^i}
 greater than n."
   (declare (integer n) (fixnum r))
   (do ((l nil (acons i r l))
@@ -1343,7 +1343,7 @@ greater than n."
 
 (declaim (inline digit-to-char))
 (defun digit-to-char (d)
-  _N"Convert digit into a character representation.  We use 0..9, a..z for
+  "Convert digit into a character representation.  We use 0..9, a..z for
 10..35, and A..Z for 36..52."
   (declare (fixnum d))
   (labels ((offset (d b) (code-char (+ d (char-code b)))))
@@ -1352,7 +1352,7 @@ greater than n."
 	  (t (error _"overflow in digit-to-char")))))
 
 (defun print-fixnum-sub (n r z s)
-  _N"Print a fixnum N to stream S, maybe with leading zeros.  This isn't
+  "Print a fixnum N to stream S, maybe with leading zeros.  This isn't
 ever-so efficient, but we probably don't need to care."
   (declare (fixnum n r z)
 	   (stream s))
@@ -1371,7 +1371,7 @@ ever-so efficient, but we probably don't need to care."
     (gen-digits n nil z)))
 
 (defun print-bignum-fast-sub (n r z s pl)
-  _N"Use the power list (see power-list) PL to split N roughly in half; then
+  "Use the power list (see power-list) PL to split N roughly in half; then
 print the left and right halves using (cdr PL).  Make sure we count the
 leading zeroes correctly."
   (declare (integer n)
@@ -1401,7 +1401,7 @@ leading zeroes correctly."
     pl))
 
 (defun print-bignum-fast (n s)
-  _N"Primary fast bignum-printing interface.  Prints integer N to stream S in
+  "Primary fast bignum-printing interface.  Prints integer N to stream S in
 radix-R.  If you have a power-list then pass it in as PL."
   (when (minusp n)
     (write-char #\- s)
@@ -1732,11 +1732,11 @@ radix-R.  If you have a power-list then pass it in as PL."
 
 
 (defconstant output-float-free-format-exponent-min -3
-  _N"Minimum power of 10 that allows the float printer to use free format,
+  "Minimum power of 10 that allows the float printer to use free format,
    instead of exponential format.  See section 22.1.3.1.3: Printing Floats
    in the ANSI CL standard.")
 (defconstant output-float-free-format-exponent-max 8
-  _N"Maximum power of 10 that allows the float printer to use free format,
+  "Maximum power of 10 that allows the float printer to use free format,
    instead of exponential format.  See section 22.1.3.1.3: Printing Floats
    in the ANSI CL standard.")
 
@@ -1787,7 +1787,7 @@ radix-R.  If you have a power-list then pass it in as PL."
 
 #+double-double
 (defun dd->lisp (a0 a1)
-  _N"Convert a DD number to a lisp rational"
+  "Convert a DD number to a lisp rational"
   (declare (double-float a0 a1))
   (+ (rational a0) (rational a1)))
 
@@ -1808,7 +1808,7 @@ radix-R.  If you have a power-list then pass it in as PL."
 
 #+double-double
 (defun dd->string (x0 x1 stream)
-  _N"Print out a double-double to a string"
+  "Print out a double-double to a string"
   (cond ((and (zerop x0) (zerop x1))
 	 (format stream "0.dd0"))
 	(t
diff --git a/code/purify.lisp b/code/purify.lisp
index d584712075ef00cc5e6c17db5b26f49d6185bed3..852d892c3303a961b5fd4789e00077c9c3e2e9e6 100644
--- a/code/purify.lisp
+++ b/code/purify.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/purify.lisp,v 1.20 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/purify.lisp,v 1.21 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -46,7 +46,7 @@
 
 
 (defun purify (&key root-structures (environment-name "Auxiliary"))
-  _N"This function optimizes garbage collection by moving all currently live
+  "This function optimizes garbage collection by moving all currently live
    objects into non-collected storage.  ROOT-STRUCTURES is an optional list of
    objects which should be copied first to maximize locality.
 
diff --git a/code/query.lisp b/code/query.lisp
index fe06b4d1940d62f76cbc524d96ef26972ec6d35b..f493445628e33d1c821511aac61e15b9dd6f7e32 100644
--- a/code/query.lisp
+++ b/code/query.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/query.lisp,v 1.6 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/query.lisp,v 1.7 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -32,7 +32,7 @@
 ;;; Y-OR-N-P  --  Public.
 ;;;
 (defun y-or-n-p (&optional format-string &rest arguments)
-  _N"Y-OR-N-P prints the message, if any, and reads characters from *QUERY-IO*
+  "Y-OR-N-P prints the message, if any, and reads characters from *QUERY-IO*
    until the user enters y or Y as an affirmative, or either n or N as a
    negative answer.  It ignores preceding whitespace and asks again if you
    enter any other characters."
@@ -60,7 +60,7 @@
 ;;; uses READ-LINE to get "YES" or "NO".
 ;;;
 (defun yes-or-no-p (&optional format-string &rest arguments)
-  _N"YES-OR-NO-P is similar to Y-OR-N-P, except that it clears the 
+  "YES-OR-NO-P is similar to Y-OR-N-P, except that it clears the 
    input buffer, beeps, and uses READ-LINE to get the strings 
    YES or NO."
   (clear-input *query-io*)
diff --git a/code/rand-mt19937.lisp b/code/rand-mt19937.lisp
index 7443444d97d6c76d22a38122afc4ab8522d160d4..6540ae553c280533776c2a7f65cb73257c76cc5b 100644
--- a/code/rand-mt19937.lisp
+++ b/code/rand-mt19937.lisp
@@ -6,7 +6,7 @@
 ;;; placed in the Public domain, and is provided 'as is'.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/rand-mt19937.lisp,v 1.21 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/rand-mt19937.lisp,v 1.22 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -177,7 +177,7 @@
 
 ;; 
 (defun init-random-state (&optional (seed 5489) state)
-  _N"Generate an random state vector from the given SEED.  The seed can be
+  "Generate an random state vector from the given SEED.  The seed can be
   either an integer or a vector of (unsigned-byte 32)"
   (declare (type (or null integer
 		     (array (unsigned-byte 32) (*)))
@@ -196,7 +196,7 @@
 (defvar *random-state* (make-random-object))
 
 (defun make-random-state (&optional state)
-  _N"Make a random state object.  If STATE is not supplied, return a copy
+  "Make a random state object.  If STATE is not supplied, return a copy
   of the default random state.  If STATE is a random state, then return a
   copy of it.  If STATE is T then return a random state generated from
   the universal time or /dev/urandom if available."
@@ -440,7 +440,7 @@
       (declare (fixnum count)))))
 
 (defun random (arg &optional (state *random-state*))
-  _N"Generate a uniformly distributed pseudo-random number between zero
+  "Generate a uniformly distributed pseudo-random number between zero
   and Arg.  State, if supplied, is the random state to use."
   (declare (inline %random-single-float %random-double-float
 		   #+long-float %long-float))
diff --git a/code/reader.lisp b/code/reader.lisp
index a3ab9f45e6983979981f7e194602baff7adadfa4..7ff5d3f75e5fd7cc3d7cc5026d77768bb01f0996 100644
--- a/code/reader.lisp
+++ b/code/reader.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/reader.lisp,v 1.65 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/reader.lisp,v 1.66 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -32,7 +32,7 @@
 
 ;;;Random global variables
 
-(defvar *read-default-float-format* 'single-float _N"Float format for 1.0E1")
+(defvar *read-default-float-format* 'single-float "Float format for 1.0E1")
 (declaim (type (member short-float single-float double-float long-float)
 	       *read-default-float-format*))
 
@@ -93,7 +93,7 @@
 
 
 (defvar std-lisp-readtable ()
-  _N"Standard lisp readtable. This is for recovery from broken
+  "Standard lisp readtable. This is for recovery from broken
    read-tables, and should not normally be user-visible.")
 
 ;; Max size of the attribute table before we switch from an array to a
@@ -114,7 +114,7 @@
 	       (declare (ignore d))
 	       (print-unreadable-object (s stream :identity t)
 		 (prin1 'readtable stream)))))
-  _N"Readtable is a data structure that maps characters into syntax
+  "Readtable is a data structure that maps characters into syntax
    types for the Common Lisp expression reader."
   ;; The CHARACTER-ATTRIBUTE-TABLE is a vector of ATTRIBUTE-TABLE-LIMIT integers for
   ;; describing the character type.  Conceptually, there are 4 distinct
@@ -196,7 +196,7 @@
 ;;;; Package specials.
 
 (defvar *old-package* ()
-  _N"Value of *package* at the start of the last read or Nil.")
+  "Value of *package* at the start of the last read or Nil.")
 
 ;;; In case we get an error trying to parse a symbol, we want to rebind the
 ;;; above stuff so it's cool.
@@ -456,7 +456,7 @@
 ;;;; Readtable operations.
 
 (defun copy-readtable (&optional (from-readtable *readtable*) to-readtable)
-  _N"A copy is made of from-readtable and place into to-readtable."
+  "A copy is made of from-readtable and place into to-readtable."
   (let ((from-readtable (or from-readtable std-lisp-readtable))
 	(to-readtable (or to-readtable (make-readtable))))
     (flet ((copy-hash-table (to from)
@@ -486,7 +486,7 @@
 (defun set-syntax-from-char (to-char from-char &optional
 				     (to-readtable *readtable*)
 				     (from-readtable ()))
-  _N"Causes the syntax of to-char to be the same as from-char in the 
+  "Causes the syntax of to-char to be the same as from-char in the 
   optional readtable (defaults to the current readtable).  The
   from-table defaults the standard lisp readtable by being nil."
   (let ((from-readtable (or from-readtable std-lisp-readtable)))
@@ -527,7 +527,7 @@
 
 (defun set-macro-character (char function &optional
 				 (non-terminatingp nil) (rt *readtable*))
-  _N"Causes char to be a macro character which invokes function when
+  "Causes char to be a macro character which invokes function when
    seen by the reader.  The non-terminatingp flag can be used to
    make the macro character non-terminating.  The optional readtable
    argument defaults to the current readtable.  Set-macro-character
@@ -539,7 +539,7 @@
   T)
 
 (defun get-macro-character (char &optional (rt *readtable*))
-  _N"Returns the function associated with the specified char which is a macro
+  "Returns the function associated with the specified char which is a macro
   character.  The optional readtable argument defaults to the current
   readtable."
   (let ((rt (or rt std-lisp-readtable)))
@@ -675,7 +675,7 @@
 ;;; current read-buffer.  
 
 (defmacro with-read-buffer (() &body body)
-  _N"Bind *read-buffer* to a fresh buffer and execute Body."
+  "Bind *read-buffer* to a fresh buffer and execute Body."
   `(let* ((*read-buffer* (allocate-read-buffer))
 	  (*read-buffer-length* (length *read-buffer*))
 	  (*ouch-ptr* 0)
@@ -740,7 +740,7 @@
 ;;;; READ-PRESERVING-WHITESPACE, READ-DELIMITED-LIST, and READ.
 
 (defvar *ignore-extra-close-parentheses* t
-  _N"If true, only warn when there is an extra close paren, otherwise error.")
+  "If true, only warn when there is an extra close paren, otherwise error.")
 
 (declaim (special *standard-input*))
 
@@ -783,7 +783,7 @@
 (defun read-preserving-whitespace (&optional (stream *standard-input*)
 				   (eof-errorp t) (eof-value nil)
 				   (recursivep nil))
-  _N"Reads from stream and returns the object read, preserving the whitespace
+  "Reads from stream and returns the object read, preserving the whitespace
    that followed the object."
   (with-read-buffer ()
     (read-preserving-whitespace-internal stream eof-errorp eof-value recursivep)))
@@ -824,7 +824,7 @@
 
 (defun read (&optional (stream *standard-input*) (eof-errorp t)
 		       (eof-value ()) (recursivep ()))
-  _N"Reads in the next object in the stream, which defaults to
+  "Reads in the next object in the stream, which defaults to
    *standard-input*. For details see the I/O chapter of
    the manual."
   (with-read-buffer ()
@@ -843,7 +843,7 @@
 (defun read-delimited-list (endchar &optional
 				    (input-stream *standard-input*)
 				    recursive-p)
-  _N"Reads objects from input-stream until the next character after an
+  "Reads objects from input-stream until the next character after an
    object's representation is endchar.  A list of those objects read
    is returned."
   (declare (ignore recursive-p))
@@ -1105,10 +1105,10 @@
 ;;;; Token fetching.
 
 (defvar *read-suppress* nil 
-  _N"Suppresses most interpreting of the reader when T")
+  "Suppresses most interpreting of the reader when T")
 
 (defvar *read-base* 10
-  _N"The radix that Lisp reads numbers in.")
+  "The radix that Lisp reads numbers in.")
 (declaim (type (integer 2 36) *read-base*))
 
 ;;; CASIFY-READ-BUFFER  --  Internal
@@ -1158,7 +1158,7 @@
 		     (all-upper (lower-em))))))))))))
   
 (defun read-token (stream firstchar)
-  _N"This function is just an fsm that recognizes numbers and symbols."
+  "This function is just an fsm that recognizes numbers and symbols."
   ;; Check explicitly whether FIRSTCHAR has an entry for
   ;; NON-TERMINATING in CHARACTER-ATTRIBUTE-TABLE and
   ;; READ-DOT-NUMBER-SYMBOL in CMT. Report an error if these are
@@ -1558,7 +1558,7 @@
 
 
 (defun read-extended-token (stream &optional (*readtable* *readtable*))
-  _N"For semi-external use: returns 3 values: the string for the token,
+  "For semi-external use: returns 3 values: the string for the token,
    a flag for whether there was an escape char, and the position of any
    package delimiter."
   (let ((firstch (read-char stream nil nil t)))
@@ -1571,7 +1571,7 @@
 	   (values "" nil nil)))))
 
 (defun read-extended-token-escaped (stream &optional (*readtable* *readtable*))
-  _N"For semi-external use: read an extended token with the first character
+  "For semi-external use: read an extended token with the first character
   escaped.  Returns the string for the token."
   (let ((firstch (read-char stream nil nil)))
     (cond (firstch
@@ -1594,7 +1594,7 @@
 (defvar *integer-reader-safe-digits*
   '#(NIL NIL
      26 17 13 11 10 9 8 8 8 7 7 7 7 6 6 6 6 6 6 6 6 5 5 5 5 5 5 5 5 5 5 5 5 5 5)
-  _N"Holds the mapping of base to 'safe' number of digits to read for a fixnum.")
+  "Holds the mapping of base to 'safe' number of digits to read for a fixnum.")
 
 (defvar *integer-reader-base-power* 
   '#(NIL NIL
@@ -1603,7 +1603,7 @@
      16777216 24137569 34012224 47045881 64000000 85766121 113379904 6436343
      7962624 9765625 11881376 14348907 17210368 20511149 24300000 28629151
      33554432 39135393 45435424 52521875 60466176)
-  _N"Holds the largest fixnum power of the base for make-integer.")
+  "Holds the largest fixnum power of the base for make-integer.")
 
 (declaim (simple-vector *integer-reader-safe-digits*
 			*integer-reader-base-power*))
@@ -1624,7 +1624,7 @@
 |#
 
 (defun make-integer ()
-  _N"Minimizes bignum-fixnum multiplies by reading a 'safe' number of digits, 
+  "Minimizes bignum-fixnum multiplies by reading a 'safe' number of digits, 
   then multiplying by a power of the base and adding."
   (read-unwind-read-buffer)
   ;; Use the fast reader if the number has enough digits.  It seems
@@ -1661,7 +1661,7 @@
 	     (setq number (+ num (* number base-power))))))))
 
 (defun fast-read-integer (r)
-  _N"Fast bignum-reading interface.  Reads from stream S an integer in radix
+  "Fast bignum-reading interface.  Reads from stream S an integer in radix
 R.  If we find some kind of error (bad characters, EOF), then NIL is
 returned; otherwise the number.  Reads at least one digit, but may not get to
 the end of the stream."
@@ -1850,7 +1850,7 @@ the end of the stream."
 (defun make-dispatch-macro-character (char &optional
 					   (non-terminating-p nil)
 					   (rt *readtable*))
-  _N"Causes char to become a dispatching macro character in readtable
+  "Causes char to become a dispatching macro character in readtable
    (which defaults to the current readtable).  If the non-terminating-p
    flag is set to T, the char will be non-terminating.  Make-dispatch-
    macro-character returns T."
@@ -1862,7 +1862,7 @@ the end of the stream."
 
 (defun set-dispatch-macro-character
        (disp-char sub-char function &optional (rt *readtable*))
-  _N"Causes function to be called whenever the reader reads
+  "Causes function to be called whenever the reader reads
    disp-char followed by sub-char. Set-dispatch-macro-character
    returns T."
   ;;get the dispatch char for macro (error if not there), diddle
@@ -1878,7 +1878,7 @@ the end of the stream."
 
 (defun get-dispatch-macro-character
        (disp-char sub-char &optional (rt *readtable*))
-  _N"Returns the macro character function for sub-char under disp-char
+  "Returns the macro character function for sub-char under disp-char
    or nil if there is no associated function."
   (unless (digit-char-p sub-char)
     (let* ((sub-char (char-upcase sub-char))
@@ -1918,12 +1918,12 @@ the end of the stream."
 ;;;; READ-FROM-STRING.
 
 (defvar read-from-string-spares ()
-  _N"A resource of string streams for Read-From-String.")
+  "A resource of string streams for Read-From-String.")
 
 (defun read-from-string (string &optional (eof-error-p t) eof-value
 				&key (start 0) end
 				preserve-whitespace)
-  _N"The characters of string are successively given to the lisp reader
+  "The characters of string are successively given to the lisp reader
    and the lisp object built by the reader is returned.  Macro chars
    will take effect."
   (declare (string string))
@@ -1948,7 +1948,7 @@ the end of the stream."
 ;;;; PARSE-INTEGER.
 
 (defun parse-integer (string &key (start 0) end (radix 10) junk-allowed)
-  _N"Examine the substring of string delimited by start and end
+  "Examine the substring of string delimited by start and end
   (default to the beginning and end of the string)  It skips over
   whitespace characters and then tries to parse an integer.  The
   radix parameter must be between 2 and 36."
diff --git a/code/remote.lisp b/code/remote.lisp
index cbbb83568b6ecb8f6fa49a539a0b953271d2b05a..92edf1f78b79aba3117e48f297787dec0a8924ed 100644
--- a/code/remote.lisp
+++ b/code/remote.lisp
@@ -1,3 +1,4 @@
+
 ;;; -*- Log: code.log; Package: wire -*-
 ;;;
 ;;; **********************************************************************
@@ -5,7 +6,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/remote.lisp,v 1.10 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/remote.lisp,v 1.11 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -28,7 +29,7 @@
   finished)
 
 (defvar *pending-returns* nil
-  _N"AList of wire . remote-wait structs")
+  "AList of wire . remote-wait structs")
 
 
 ;;; MAYBE-NUKE-REMOTE-WAIT -- internal
@@ -52,7 +53,7 @@
 ;;; environment of the macro call. No values are returned.
 ;;;
 (defmacro remote (wire-form &body forms)
-  _N"Evaluates the given forms remotly. No values are returned, as the remote
+  "Evaluates the given forms remotly. No values are returned, as the remote
 evaluation is asyncronus."
   (let ((wire (gensym)))
     `(let ((,wire ,wire-form))
@@ -72,7 +73,7 @@ evaluation is asyncronus."
 ;;; return, cause we can kind of guess at what the currect results would be.
 ;;;
 (defmacro remote-value-bind (wire-form vars form &rest body)
-  _N"Bind VARS to the multiple values of FORM (which is executed remotely). The
+  "Bind VARS to the multiple values of FORM (which is executed remotely). The
 forms in BODY are only executed if the remote function returned (as apposed
 to aborting due to a throw)."
   (cond
@@ -143,7 +144,7 @@ to aborting due to a throw)."
 (defmacro remote-value (wire-form form &optional
 				  (on-server-unwind
 				   `(error _"Remote server unwound")))
-  _N"Execute the single form remotly. The value of the form is returned.
+  "Execute the single form remotly. The value of the form is returned.
   The optional form on-server-unwind is only evaluated if the server unwinds
   instead of returning."
   (let ((remote (gensym))
@@ -323,7 +324,7 @@ to aborting due to a throw)."
 ;;; it, call NEW-CONNECTION to do the connecting.
 ;;;
 (defun create-request-server (port &optional on-connect &key reuse-address)
-  _N"Create a request server on the given port.  Whenever anyone connects to it,
+  "Create a request server on the given port.  Whenever anyone connects to it,
    call the given function with the newly created wire and the address of the
    connector.  If the function returns NIL, the connection is destroyed;
    otherwise, it is accepted.  This returns a manifestation of the server that
@@ -345,7 +346,7 @@ to aborting due to a throw)."
 ;;; closes the socket behind it.
 ;;;
 (defun destroy-request-server (server)
-  _N"Quit accepting connections to the given request server."
+  "Quit accepting connections to the given request server."
   (system:remove-fd-handler (request-server-handler server))
   (ext:close-socket (request-server-socket server))
   nil)
@@ -356,7 +357,7 @@ to aborting due to a throw)."
 ;;; installed to handle return values, etc.
 ;;; 
 (defun connect-to-remote-server (hostname port &optional on-death)
-  _N"Connect to a remote request server addressed with the given host and port
+  "Connect to a remote request server addressed with the given host and port
    pair.  This returns the created wire."
   (let* ((socket (ext:connect-to-inet-socket hostname port))
 	 (wire (make-wire socket)))
diff --git a/code/room.lisp b/code/room.lisp
index 24f0840db0b84315616285cbacd6d2fe04d738c6..a2778c30da4c0c5d8472ef1bbe5367e28ce92e0a 100644
--- a/code/room.lisp
+++ b/code/room.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/room.lisp,v 1.38 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/room.lisp,v 1.39 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -565,7 +565,7 @@
 ;;;
 (defun memory-usage (&key print-spaces (count-spaces '(:dynamic))
 			  (print-summary t) cutoff)
-  _N"Print out information about the heap memory in use.  :Print-Spaces is a list
+  "Print out information about the heap memory in use.  :Print-Spaces is a list
   of the spaces to print detailed information for.  :Count-Spaces is a list of
   the spaces to scan.  For either one, T means all spaces (:Static, :Dyanmic
   and :Read-Only.)  If :Print-Summary is true, then summary information will be
@@ -593,7 +593,7 @@
 ;;; COUNT-NO-OPS  --  Public
 ;;;
 (defun count-no-ops (space)
-  _N"Print info about how much code and no-ops there are in Space."
+  "Print info about how much code and no-ops there are in Space."
   (declare (type spaces space))
   (let ((code-words 0)
 	(no-ops 0)
@@ -707,7 +707,7 @@
 ;;;
 (defun instance-usage (space &key (top-n 15))
   (declare (type spaces space) (type (or fixnum null) top-n))
-  _N"Print a breakdown by instance type of all the instances allocated in
+  "Print a breakdown by instance type of all the instances allocated in
   Space.  If TOP-N is true, print only information for the the TOP-N types with
   largest usage."
   (format t _"~2&~@[Top ~D ~]~(~A~) instance types:~%" top-n space)
@@ -1075,7 +1075,7 @@
 	(hist:hist-record (funcall function count))))))
 
 (defun report-top-n (table &key (top-n 20) (function #'identity))
-  _N"Report the Top-N entries in the hashtable Table, when sorted by Function
+  "Report the Top-N entries in the hashtable Table, when sorted by Function
   applied to the hash value.  If Top-N is NIL, report all entries."
   (let ((function (if (eval:interpreted-function-p function)
 		      (compile nil function)
@@ -1126,7 +1126,7 @@
 	
 
 (defun find-caller-counts (space)
-  _N"Return a hashtable mapping each function in for which a call appears in
+  "Return a hashtable mapping each function in for which a call appears in
   Space to the number of times such a call appears."
   (let ((counts (make-hash-table :test #'eq)))
     (map-allocated-objects
@@ -1141,7 +1141,7 @@
     counts))
 
 (defun find-high-callers (space &key (above 10) table (threshold 2))
-  _N"Return a hashtable translating code objects to function constant counts for
+  "Return a hashtable translating code objects to function constant counts for
   all code objects in Space with more than Above function constants."
   (let ((counts (make-hash-table :test #'eq)))
     (map-allocated-objects
diff --git a/code/run-program.lisp b/code/run-program.lisp
index 148b3246c760df3e42e383462dd6fc1a1ec69e13..fa12f4a9c996f28671ee553b9aaf052d03eaf35b 100644
--- a/code/run-program.lisp
+++ b/code/run-program.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/run-program.lisp,v 1.29 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/run-program.lisp,v 1.30 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -40,7 +40,7 @@
   (defconstant wait-wstopped #-svr4 #o177 #+svr4 wait-wuntraced))
 
 (defun wait3 (&optional do-not-hang check-for-stopped)
-  _N"Return any available status information on child processed. "
+  "Return any available status information on child processed. "
   (multiple-value-bind (pid status)
 		       (c-wait3 (logior (if do-not-hang
 					  wait-wnohang
@@ -78,7 +78,7 @@
 ;;;; Process control stuff.
 
 (defvar *active-processes* nil
-  _N"List of process structures for all active processes.")
+  "List of process structures for all active processes.")
 
 (defstruct (process (:print-function %print-process))
   pid			    ; PID of child process.
@@ -103,7 +103,7 @@
 ;;; PROCESS-STATUS -- Public.
 ;;;
 (defun process-status (proc)
-  _N"Return the current status of process.  The result is one of :running,
+  "Return the current status of process.  The result is one of :running,
    :stopped, :exited, :signaled."
   (declare (type process proc))
   (get-processes-status-changes)
@@ -113,7 +113,7 @@
 ;;; PROCESS-WAIT -- Public.
 ;;;
 (defun process-wait (proc &optional check-for-stopped)
-  _N"Wait for PROC to quit running for some reason.  Returns PROC."
+  "Wait for PROC to quit running for some reason.  Returns PROC."
   (declare (type process proc))
   (loop
     (case (process-status proc)
@@ -152,7 +152,7 @@
 ;;; Hand a process a signal.
 ;;;
 (defun process-kill (proc signal &optional (whom :pid))
-  _N"Hand SIGNAL to PROC.  If whom is :pid, use the kill Unix system call.  If
+  "Hand SIGNAL to PROC.  If whom is :pid, use the kill Unix system call.  If
    whom is :process-group, use the killpg Unix system call.  If whom is
    :pty-process-group deliver the signal to whichever process group is currently
    in the foreground."
@@ -194,7 +194,7 @@
 ;;; Returns T if the process is still alive, NIL otherwise.
 ;;; 
 (defun process-alive-p (proc)
-  _N"Returns T if the process is still alive, NIL otherwise."
+  "Returns T if the process is still alive, NIL otherwise."
   (declare (type process proc))
   (let ((status (process-status proc)))
     (if (or (eq status :running)
@@ -207,7 +207,7 @@
 ;;; Close all the streams held open by PROC.
 ;;; 
 (defun process-close (proc)
-  _N"Close all streams connected to PROC and stop maintaining the status slot."
+  "Close all streams connected to PROC and stop maintaining the status slot."
   (declare (type process proc))
   (macrolet ((frob (stream abort)
 	       `(when ,stream (close ,stream :abort ,abort))))
@@ -253,11 +253,11 @@
 ;;;; RUN-PROGRAM and close friends.
 
 (defvar *close-on-error* nil
-  _N"List of file descriptors to close when RUN-PROGRAM exits due to an error.")
+  "List of file descriptors to close when RUN-PROGRAM exits due to an error.")
 (defvar *close-in-parent* nil
-  _N"List of file descriptors to close when RUN-PROGRAM returns in the parent.")
+  "List of file descriptors to close when RUN-PROGRAM returns in the parent.")
 (defvar *handlers-installed* nil
-  _N"List of handlers installed by RUN-PROGRAM.")
+  "List of handlers installed by RUN-PROGRAM.")
 
 
 ;;; FIND-A-PTY -- internal
@@ -455,7 +455,7 @@
 		    &key (env *environment-list*) (wait t) pty input
 		    if-input-does-not-exist output (if-output-exists :error)
 		    (error :output) (if-error-exists :error) status-hook)
-  _N"RUN-PROGRAM creates a new process and runs the unix program in the
+  "RUN-PROGRAM creates a new process and runs the unix program in the
    file specified by the simple-string PROGRAM.  ARGS are the standard
    arguments that can be passed to a Unix program, for no arguments
    use NIL (which means just the name of the program is passed as arg 0).
diff --git a/code/sap.lisp b/code/sap.lisp
index 01fd268ae8c46421180fa3d328c432635ae61c70..d3133d65a29f87301428ef04e94648a83f2e9ece 100644
--- a/code/sap.lisp
+++ b/code/sap.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sap.lisp,v 1.22 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sap.lisp,v 1.23 2010/04/19 02:18:04 rtoy Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -36,91 +36,91 @@
 ;;;; Primitive SAP operations.
 
 (defun sap< (x y)
-  _N"Return T iff the SAP X points to a smaller address then the SAP Y."
+  "Return T iff the SAP X points to a smaller address then the SAP Y."
   (declare (type system-area-pointer x y))
   (sap< x y))
 
 (defun sap<= (x y)
-  _N"Return T iff the SAP X points to a smaller or the same address as
+  "Return T iff the SAP X points to a smaller or the same address as
    the SAP Y."
   (declare (type system-area-pointer x y))
   (sap<= x y))
 
 (defun sap= (x y)
-  _N"Return T iff the SAP X points to the same address as the SAP Y."
+  "Return T iff the SAP X points to the same address as the SAP Y."
   (declare (type system-area-pointer x y))
   (sap= x y))
 
 (defun sap>= (x y)
-  _N"Return T iff the SAP X points to a larger or the same address as
+  "Return T iff the SAP X points to a larger or the same address as
    the SAP Y."
   (declare (type system-area-pointer x y))
   (sap>= x y))
 
 (defun sap> (x y)
-  _N"Return T iff the SAP X points to a larger address then the SAP Y."
+  "Return T iff the SAP X points to a larger address then the SAP Y."
   (declare (type system-area-pointer x y))
   (sap> x y))
 
 (defun sap+ (sap offset)
-  _N"Return a new sap OFFSET bytes from SAP."
+  "Return a new sap OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset))
   (sap+ sap offset))
 
 (defun sap- (sap1 sap2)
-  _N"Return the byte offset between SAP1 and SAP2."
+  "Return the byte offset between SAP1 and SAP2."
   (declare (type system-area-pointer sap1 sap2))
   (sap- sap1 sap2))
 
 (defun sap-int (sap)
-  _N"Converts a System Area Pointer into an integer."
+  "Converts a System Area Pointer into an integer."
   (declare (type system-area-pointer sap))
   (sap-int sap))
 
 (defun int-sap (int)
-  _N"Converts an integer into a System Area Pointer."
+  "Converts an integer into a System Area Pointer."
   (declare (type (unsigned-byte #-alpha #.vm:word-bits #+alpha 64) int))
   (int-sap int))
 
 (defun sap-ref-8 (sap offset)
-  _N"Returns the 8-bit byte at OFFSET bytes from SAP."
+  "Returns the 8-bit byte at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset))
   (sap-ref-8 sap offset))
 
 (defun sap-ref-16 (sap offset)
-  _N"Returns the 16-bit word at OFFSET bytes from SAP."
+  "Returns the 16-bit word at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (type (signed-byte #-alpha #.(1- vm:word-bits) #+alpha 63) offset))
   (sap-ref-16 sap offset))
 
 (defun sap-ref-32 (sap offset)
-  _N"Returns the 32-bit dualword at OFFSET bytes from SAP."
+  "Returns the 32-bit dualword at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (fixnum offset))
   (sap-ref-32 sap offset))
 
 (defun sap-ref-64 (sap offset)
-  _N"Returns the 64-bit quadword at OFFSET bytes from SAP."
+  "Returns the 64-bit quadword at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (fixnum offset))
   (sap-ref-64 sap offset))
 
 (defun sap-ref-sap (sap offset)
-  _N"Returns the 32-bit system-area-pointer at OFFSET bytes from SAP."
+  "Returns the 32-bit system-area-pointer at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset))
   (sap-ref-sap sap offset))
 
 (defun sap-ref-single (sap offset)
-  _N"Returns the 32-bit single-float at OFFSET bytes from SAP."
+  "Returns the 32-bit single-float at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (fixnum offset))
   (sap-ref-single sap offset))
 
 (defun sap-ref-double (sap offset)
-  _N"Returns the 64-bit double-float at OFFSET bytes from SAP."
+  "Returns the 64-bit double-float at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (fixnum offset))
   (sap-ref-double sap offset))
@@ -133,25 +133,25 @@
   (sap-ref-long sap offset))
 
 (defun signed-sap-ref-8 (sap offset)
-  _N"Returns the signed 8-bit byte at OFFSET bytes from SAP."
+  "Returns the signed 8-bit byte at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset))
   (signed-sap-ref-8 sap offset))
 
 (defun signed-sap-ref-16 (sap offset)
-  _N"Returns the signed 16-bit word at OFFSET bytes from SAP."
+  "Returns the signed 16-bit word at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (type (signed-byte #-alpha #.(1- vm:word-bits) #+alpha 63) offset))
   (signed-sap-ref-16 sap offset))
 
 (defun signed-sap-ref-32 (sap offset)
-  _N"Returns the signed 32-bit dualword at OFFSET bytes from SAP."
+  "Returns the signed 32-bit dualword at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (fixnum offset))
   (signed-sap-ref-32 sap offset))
 
 (defun signed-sap-ref-64 (sap offset)
-  _N"Returns the signed 64-bit quadword at OFFSET bytes from SAP."
+  "Returns the signed 64-bit quadword at OFFSET bytes from SAP."
   (declare (type system-area-pointer sap)
 	   (fixnum offset))
   (signed-sap-ref-64 sap offset))
diff --git a/code/save.lisp b/code/save.lisp
index df65efd4a0f9f269cd5d815770f245d439b6ca7c..8c187125275362d9a66b3394653a953817e94c48 100644
--- a/code/save.lisp
+++ b/code/save.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.66 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.67 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -26,23 +26,23 @@
 (in-package "LISP")
 
 (defvar *before-save-initializations* nil
-  _N"This is a list of functions which are called before creating a saved core
+  "This is a list of functions which are called before creating a saved core
   image.  These functions are executed in the child process which has no ports,
   so they cannot do anything that tries to talk to the outside world.")
 
 (defvar *after-save-initializations* nil
-  _N"This is a list of functions which are called when a saved core image starts
+  "This is a list of functions which are called when a saved core image starts
   up.  The system itself should be initialized at this point, but applications
   might not be.")
 
 (defvar *environment-list* nil
-  _N"An alist mapping environment variables (as keywords) to either values")
+  "An alist mapping environment variables (as keywords) to either values")
 
 (defvar *environment-list-initialized* nil
-  _N"Non-NIL if environment-init has been called")
+  "Non-NIL if environment-init has been called")
 
 (defvar *editor-lisp-p* nil
-  _N"This is true if and only if the lisp was started with the -edit switch.")
+  "This is true if and only if the lisp was started with the -edit switch.")
 
 
 
@@ -150,7 +150,7 @@
 		                  #+:executable
 		                 (executable nil)
 				 (batch-mode nil))
-  _N"Saves a CMU Common Lisp core image in the file of the specified name.  The
+  "Saves a CMU Common Lisp core image in the file of the specified name.  The
   following keywords are defined:
   
   :purify
@@ -311,7 +311,7 @@
 ;;;; PRINT-HERALD support.
 
 (defvar *herald-items* ()
-  _N"Determines what PRINT-HERALD prints (the system startup banner.)  This is a
+  "Determines what PRINT-HERALD prints (the system startup banner.)  This is a
    database which can be augmented by each loaded system.  The format is a
    property list which maps from subsystem names to the banner information for
    that system.  This list can be manipulated with GETF -- entries are printed
@@ -374,7 +374,7 @@
 ;;; PRINT-HERALD  --  Public
 ;;;
 (defun print-herald (&optional (stream *standard-output*))
-  _N"Print some descriptive information about the Lisp system version and
+  "Print some descriptive information about the Lisp system version and
    configuration."
   (let ((res ()))
     (do ((item *herald-items* (cddr item)))
diff --git a/code/search-list.lisp b/code/search-list.lisp
index f6b25d3e37809f64c779ed1d36689da0a64e8d94..7d2aa2c126738436033eaf11f863570ae6f845a2 100644
--- a/code/search-list.lisp
+++ b/code/search-list.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/search-list.lisp,v 1.5 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/search-list.lisp,v 1.6 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -26,7 +26,7 @@
 
 
 (defun search-list (name)
-  _N"Returns a list of strings that are the of name.
+  "Returns a list of strings that are the of name.
    This is setf'able.  If any provided string in a setting value
    does end with a colon or slash, a slash is added.  Also, the
    list is copied."
@@ -55,7 +55,7 @@
 
 
 (defun resolve-search-list (name first-only-p)
-  _N"This takes a Sesame search-list name (\"default\") instead of the form
+  "This takes a Sesame search-list name (\"default\") instead of the form
    taken by SEARCH-LIST (\"default:\").  If first-only-p is non-nil, then
    only the first complete expansion of name is returned.  If, during the
    expansion of name, an undefined search list is encountered, an error
diff --git a/code/seq.lisp b/code/seq.lisp
index 362f48a534272065796f095a61c0a25a0b1a7aaf..b8d68e15aba3780e6b60072f71d50d03f4e9f965 100644
--- a/code/seq.lisp
+++ b/code/seq.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/seq.lisp,v 1.56 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/seq.lisp,v 1.57 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -49,16 +49,16 @@
 	   ,array-form)))
 
 (defmacro elt-slice (sequences n)
-  _N"Returns a list of the Nth element of each of the sequences.  Used by MAP
+  "Returns a list of the Nth element of each of the sequences.  Used by MAP
    and friends."
   `(mapcar #'(lambda (seq) (elt seq ,n)) ,sequences))
 
 (defmacro make-sequence-like (sequence length)
-  _N"Returns a sequence of the same type as SEQUENCE and the given LENGTH."
+  "Returns a sequence of the same type as SEQUENCE and the given LENGTH."
   `(make-sequence-of-type (type-of ,sequence) ,length))
 
 (defmacro type-specifier-atom (type)
-  _N"Returns the broad class of which TYPE is a specific subclass."
+  "Returns the broad class of which TYPE is a specific subclass."
   `(if (atom ,type) ,type (car ,type)))
 
 ) ; eval-when
@@ -123,7 +123,7 @@
 			      '(integer (0) (0))))))
 
 (defun make-sequence-of-type (type length)
-  _N"Returns a sequence of the given TYPE and LENGTH."
+  "Returns a sequence of the given TYPE and LENGTH."
   (declare (fixnum length))
   (case (type-specifier-atom type)
     (list (make-list length))
@@ -139,7 +139,7 @@
      (make-sequence-of-type (result-type-or-lose type) length))))
   
 (defun elt (sequence index)
-  _N"Returns the element of SEQUENCE specified by INDEX."
+  "Returns the element of SEQUENCE specified by INDEX."
   (etypecase sequence
     (list
      (do ((count index (1- count))
@@ -155,7 +155,7 @@
      (aref sequence index))))
 
 (defun %setelt (sequence index newval)
-  _N"Store NEWVAL as the component of SEQUENCE specified by INDEX."
+  "Store NEWVAL as the component of SEQUENCE specified by INDEX."
   (etypecase sequence
     (list
      (do ((count index (1- count))
@@ -172,7 +172,7 @@
 
 
 (defun length (sequence)
-  _N"Returns an integer that is the length of SEQUENCE."
+  "Returns an integer that is the length of SEQUENCE."
   (etypecase sequence
     (vector (length (truly-the vector sequence)))
     (list (length (truly-the list sequence)))))
@@ -214,7 +214,7 @@
 	 :format-arguments (list (type-specifier type-spec) length)))
 	 
 (defun make-sequence (type length &key (initial-element NIL iep))
-  _N"Returns a sequence of the given Type and Length, with elements initialized
+  "Returns a sequence of the given Type and Length, with elements initialized
   to :Initial-Element."
   (declare (fixnum length))
   (flet ((check-seq-len (spec-type length)
@@ -312,7 +312,7 @@
 ;;; in the body of the function, and this is actually done in the support
 ;;; routines for other reasons (see above).
 (defun subseq (sequence start &optional end)
-  _N"Returns a copy of a subsequence of SEQUENCE starting with element number 
+  "Returns a copy of a subsequence of SEQUENCE starting with element number 
    START and continuing to the end of SEQUENCE or the optional END."
   (seq-dispatch sequence
 		(list-subseq* sequence start end)
@@ -345,7 +345,7 @@
 )
 
 (defun copy-seq (sequence)
-  _N"Returns a copy of SEQUENCE which is EQUAL to SEQUENCE but not EQ."
+  "Returns a copy of SEQUENCE which is EQUAL to SEQUENCE but not EQ."
   (seq-dispatch sequence
 		(list-copy-seq* sequence)
 		(vector-copy-seq* sequence)))
@@ -397,7 +397,7 @@
 ;;; in the body of the function, and this is actually done in the support
 ;;; routines for other reasons (see above).
 (defun fill (sequence item &key (start 0) end)
-  _N"Replace the specified elements of SEQUENCE with ITEM."
+  "Replace the specified elements of SEQUENCE with ITEM."
   (seq-dispatch sequence
 		(list-fill* sequence item start end)
 		(vector-fill* sequence item start end)))
@@ -519,7 +519,7 @@
 		((:end1 target-end))
 		((:start2 source-start) 0)
 		((:end2 source-end)))
-  _N"The target sequence is destructively modified by copying successive
+  "The target sequence is destructively modified by copying successive
    elements into it from the source sequence."
   (let ((target-end (or target-end (length target-sequence)))
 	(source-end (or source-end (length source-sequence))))
@@ -555,7 +555,7 @@
 )
 
 (defun reverse (sequence)
-  _N"Returns a new sequence containing the same elements but in reverse order."
+  "Returns a new sequence containing the same elements but in reverse order."
   (seq-dispatch sequence
 		(list-reverse* sequence)
 		(vector-reverse* sequence)
@@ -603,7 +603,7 @@
   (vector-nreverse sequence))
 
 (defun nreverse (sequence)
-  _N"Returns a sequence of the same elements in reverse order; the argument
+  "Returns a sequence of the same elements in reverse order; the argument
    is destroyed."
   (seq-dispatch sequence
 		(list-nreverse* sequence)
@@ -667,7 +667,7 @@
 )
 
 (defun concatenate (output-type-spec &rest sequences)
-  _N"Returns a new sequence of all the argument sequences concatenated together
+  "Returns a new sequence of all the argument sequences concatenated together
   which shares no structure with the original argument sequences of the
   specified OUTPUT-TYPE-SPEC."
   (case (type-specifier-atom output-type-spec)
@@ -800,7 +800,7 @@
       result)))
 
 (defun map (output-type-spec function first-sequence &rest more-sequences)
-  _N"FUNCTION must take as many arguments as there are sequences provided.  The 
+  "FUNCTION must take as many arguments as there are sequences provided.  The 
    result is a sequence such that element i is the result of applying FUNCTION
    to element i of each of the argument sequences."
   (let ((sequences (cons first-sequence more-sequences)))
@@ -877,27 +877,27 @@
 ) ; eval-when
 
 (defquantifier some
-  _N"PREDICATE is applied to the elements with index 0 of the sequences, then 
+  "PREDICATE is applied to the elements with index 0 of the sequences, then 
    possibly to those with index 1, and so on.  SOME returns the first 
    non-() value encountered, or () if the end of a sequence is reached."
   nil t result)
 
 (defquantifier every
-  _N"PREDICATE is applied to the elements with index 0 of the sequences, then
+  "PREDICATE is applied to the elements with index 0 of the sequences, then
    possibly to those with index 1, and so on.  EVERY returns () as soon
    as any invocation of PREDICATE returns (), or T if every invocation
    is non-()."
   t nil nil)
 
 (defquantifier notany
-  _N"PREDICATE is applied to the elements with index 0 of the sequences, then 
+  "PREDICATE is applied to the elements with index 0 of the sequences, then 
    possibly to those with index 1, and so on.  NOTANY returns () as soon
    as any invocation of PREDICATE returns a non-() value, or T if the end
    of a sequence is reached."
   t t nil)
 
 (defquantifier notevery
-  _N"PREDICATE is applied to the elements with index 0 of the sequences, then
+  "PREDICATE is applied to the elements with index 0 of the sequences, then
    possibly to those with index 1, and so on.  NOTEVERY returns T as soon
    as any invocation of PREDICATE returns (), or () if every invocation
    is non-()."
@@ -954,7 +954,7 @@
 
 (defun reduce (function sequence &key key from-end (start 0)
 			end (initial-value nil ivp))
-  _N"The specified Sequence is ``reduced'' using the given Function.
+  "The specified Sequence is ``reduced'' using the given Function.
   See manual for details."
   (declare (type index start))
   (let ((start start)
@@ -985,7 +985,7 @@
 ;;; Coerce:
 
 (defun coerce (object output-type-spec)
-  _N"Coerces the Object to an object of type Output-Type-Spec."
+  "Coerces the Object to an object of type Output-Type-Spec."
   (labels ((coerce-error ()
 	     (error 'simple-type-error
 		    :expected-type output-type-spec
@@ -1273,7 +1273,7 @@
 
 (defun delete (item sequence &key from-end (test #'eql) test-not (start 0)
 		end count key)
-  _N"Returns a sequence formed by destructively removing the specified Item from
+  "Returns a sequence formed by destructively removing the specified Item from
   the given Sequence."
   (declare (fixnum start))
   (let* ((length (length sequence))
@@ -1310,7 +1310,7 @@
 )
 
 (defun delete-if (predicate sequence &key from-end (start 0) key end count)
-  _N"Returns a sequence formed by destructively removing the elements satisfying
+  "Returns a sequence formed by destructively removing the elements satisfying
   the specified Predicate from the given Sequence."
   (declare (fixnum start))
   (let* ((length (length sequence))
@@ -1347,7 +1347,7 @@
 )
 
 (defun delete-if-not (predicate sequence &key from-end (start 0) end key count)
-  _N"Returns a sequence formed by destructively removing the elements not
+  "Returns a sequence formed by destructively removing the elements not
   satisfying the specified Predicate from the given Sequence."
   (declare (fixnum start))
   (let* ((length (length sequence))
@@ -1496,7 +1496,7 @@
 
 (defun remove (item sequence &key from-end (test #'eql) test-not (start 0)
 		end count key)
-  _N"Returns a copy of SEQUENCE with elements satisfying the test (default is
+  "Returns a copy of SEQUENCE with elements satisfying the test (default is
    EQL) with ITEM removed."
   (declare (fixnum start))
   (let* ((length (length sequence))
@@ -1513,7 +1513,7 @@
 		      (normal-mumble-remove)))))
 
 (defun remove-if (predicate sequence &key from-end (start 0) end count key)
-  _N"Returns a copy of sequence with elements such that predicate(element)
+  "Returns a copy of sequence with elements such that predicate(element)
    is non-null are removed"
   (declare (fixnum start))
   (let* ((length (length sequence))
@@ -1530,7 +1530,7 @@
 		      (if-mumble-remove)))))
 
 (defun remove-if-not (predicate sequence &key from-end (start 0) end count key)
-  _N"Returns a copy of sequence with elements such that predicate(element)
+  "Returns a copy of sequence with elements such that predicate(element)
    is null are removed"
   (declare (fixnum start))
   (let* ((length (length sequence))
@@ -1639,7 +1639,7 @@
 
 (defun remove-duplicates (sequence &key (test #'eql) test-not (start 0)
 					from-end end key)
-  _N"The elements of Sequence are compared pairwise, and if any two match,
+  "The elements of Sequence are compared pairwise, and if any two match,
    the one occuring earlier is discarded, unless FROM-END is true, in
    which case the one later in the sequence is discarded.  The resulting
    sequence is returned.
@@ -1720,7 +1720,7 @@
 
 (defun delete-duplicates (sequence &key (test #'eql) test-not (start 0)
 					from-end end key)
-  _N"The elements of Sequence are examined, and if any two match, one is
+  "The elements of Sequence are examined, and if any two match, one is
    discarded.  The resulting sequence, which may be formed by destroying the
    given sequence, is returned.
 
@@ -1828,7 +1828,7 @@
 
 (defun substitute (new old sequence &key from-end (test #'eql) test-not
 		   (start 0) count end key)
-  _N"Returns a sequence of the same kind as Sequence with the same elements
+  "Returns a sequence of the same kind as Sequence with the same elements
   except that all elements equal to Old are replaced with New.  See manual
   for details."
   (declare (fixnum start))
@@ -1843,7 +1843,7 @@
 ;;; Substitute-If:
 
 (defun substitute-if (new test sequence &key from-end (start 0) end count key)
-  _N"Returns a sequence of the same kind as Sequence with the same elements
+  "Returns a sequence of the same kind as Sequence with the same elements
   except that all elements satisfying the Test are replaced with New.  See
   manual for details."
   (declare (fixnum start))
@@ -1861,7 +1861,7 @@
 
 (defun substitute-if-not (new test sequence &key from-end (start 0)
 			   end count key)
-  _N"Returns a sequence of the same kind as Sequence with the same elements
+  "Returns a sequence of the same kind as Sequence with the same elements
   except that all elements not satisfying the Test are replaced with New.
   See manual for details."
   (declare (fixnum start))
@@ -1880,7 +1880,7 @@
 
 (defun nsubstitute (new old sequence &key from-end (test #'eql) test-not 
 		     end count key (start 0))
-  _N"Returns a sequence of the same kind as Sequence with the same elements
+  "Returns a sequence of the same kind as Sequence with the same elements
   except that all elements equal to Old are replaced with New.  The Sequence
   may be destroyed.  See manual for details."
   (declare (fixnum start))
@@ -1929,7 +1929,7 @@
 ;;; NSubstitute-If:
 
 (defun nsubstitute-if (new test sequence &key from-end (start 0) end count key)
-  _N"Returns a sequence of the same kind as Sequence with the same elements
+  "Returns a sequence of the same kind as Sequence with the same elements
    except that all elements satisfying the Test are replaced with New.  The
    Sequence may be destroyed.  See manual for details."
   (declare (fixnum start))
@@ -1972,7 +1972,7 @@
 
 (defun nsubstitute-if-not (new test sequence &key from-end (start 0)
 			       end count key)
-  _N"Returns a sequence of the same kind as Sequence with the same elements
+  "Returns a sequence of the same kind as Sequence with the same elements
    except that all elements not satisfying the Test are replaced with New.
    The Sequence may be destroyed.  See manual for details."
   (declare (fixnum start))
@@ -2140,7 +2140,7 @@
 ;;; routines for other reasons (see below).
 (defun position (item sequence &key from-end (test #'eql) test-not (start 0)
 		  end key)
-  _N"Returns the zero-origin index of the first element in SEQUENCE
+  "Returns the zero-origin index of the first element in SEQUENCE
    satisfying the test (default is EQL) with the given ITEM"
   (seq-dispatch sequence
     (list-position* item sequence from-end test test-not start end key)
@@ -2176,7 +2176,7 @@
 )
 
 (defun position-if (test sequence &key from-end (start 0) key end)
-  _N"Returns the zero-origin index of the first element satisfying test(el)"
+  "Returns the zero-origin index of the first element satisfying test(el)"
   (declare (fixnum start))
   (let ((end (or end (length sequence))))
     (declare (type index end))
@@ -2198,7 +2198,7 @@
 )
 
 (defun position-if-not (test sequence &key from-end (start 0) key end)
-  _N"Returns the zero-origin index of the first element not satisfying test(el)"
+  "Returns the zero-origin index of the first element not satisfying test(el)"
   (declare (fixnum start))
   (let ((end (or end (length sequence))))
     (declare (type index end))
@@ -2225,7 +2225,7 @@
 ;;; routines for other reasons (see above).
 (defun find (item sequence &key from-end (test #'eql) test-not (start 0)
 	       end key)
-  _N"Returns the first element in SEQUENCE satisfying the test (default
+  "Returns the first element in SEQUENCE satisfying the test (default
    is EQL) with the given ITEM"
   (declare (fixnum start))
   (seq-dispatch sequence
@@ -2259,7 +2259,7 @@
 )
 
 (defun find-if (test sequence &key from-end (start 0) end key)
-  _N"Returns the first element in SEQUENCE satisfying the test."
+  "Returns the first element in SEQUENCE satisfying the test."
   (declare (fixnum start))
   (let ((end (or end (length sequence))))
     (declare (type index end))
@@ -2281,7 +2281,7 @@
 )
 
 (defun find-if-not (test sequence &key from-end (start 0) end key)
-  _N"Returns the first element in SEQUENCE not satisfying the test."
+  "Returns the first element in SEQUENCE not satisfying the test."
   (declare (fixnum start))
   (let ((end (or end (length sequence))))
     (declare (type index end))
@@ -2323,7 +2323,7 @@
 
 (defun count (item sequence &key from-end (test #'eql test-p) (test-not nil test-not-p)
 		   (start 0) end key)
-  _N"Returns the number of elements in SEQUENCE satisfying a test with ITEM,
+  "Returns the number of elements in SEQUENCE satisfying a test with ITEM,
    which defaults to EQL."
   (declare (fixnum start))
   (when (and test-p test-not-p)
@@ -2350,7 +2350,7 @@
 ;;; Count-if:
 
 (defun count-if (test sequence &key from-end (start 0) end key)
-  _N"Returns the number of elements in SEQUENCE satisfying TEST(el)."
+  "Returns the number of elements in SEQUENCE satisfying TEST(el)."
   (declare (fixnum start))
   (let* ((length (length sequence))
 	 (end (or end length)))
@@ -2364,7 +2364,7 @@
 		      (vector-count-if nil nil test sequence)))))
 
 (defun count-if-not (test sequence &key from-end (start 0) end key)
-  _N"Returns the number of elements in SEQUENCE satisfying TEST(el)."
+  "Returns the number of elements in SEQUENCE satisfying TEST(el)."
   (declare (fixnum start))
   (let* ((length (length sequence))
 	 (end (or end length)))
@@ -2457,7 +2457,7 @@
 
 (defun mismatch (sequence1 sequence2 &key from-end (test #'eql) test-not 
 			   (start1 0) end1 (start2 0) end2 key)
-  _N"The specified subsequences of Sequence1 and Sequence2 are compared
+  "The specified subsequences of Sequence1 and Sequence2 are compared
    element-wise.  If they are of equal length and match in every element, the
    result is NIL.  Otherwise, the result is a non-negative integer, the index
    within Sequence1 of the leftmost position at which they fail to match; or,
@@ -2576,7 +2576,7 @@
 
 (defun search (sequence1 sequence2 &key from-end (test #'eql) test-not 
 		(start1 0) end1 (start2 0) end2 key)
-  _N"A search is conducted using EQL for the first subsequence of sequence2 
+  "A search is conducted using EQL for the first subsequence of sequence2 
    which element-wise matches sequence1.  If there is such a subsequence in 
    sequence2, the index of the its leftmost element is returned; 
    otherwise () is returned."
diff --git a/code/serve-event.lisp b/code/serve-event.lisp
index 5b021a93a53d15037211b594515ddd21d77fd1e8..1b503792192eccab9bd96aea15a7775cbfe4d424 100644
--- a/code/serve-event.lisp
+++ b/code/serve-event.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/serve-event.lisp,v 1.29 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/serve-event.lisp,v 1.30 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -125,7 +125,7 @@
 ;;;    Look up the handler function for a given message ID.
 ;;;
 (defun object-set-operation (object-set message-id)
-  _N"Return the handler function in Object-Set for the operation specified by
+  "Return the handler function in Object-Set for the operation specified by
    Message-ID, if none, NIL is returned."
   (check-type object-set object-set)
   (check-type message-id fixnum)
@@ -141,7 +141,7 @@
   (setf (gethash message-id (object-set-table object-set)) new-value))
 ;;;
 (defsetf object-set-operation %set-object-set-operation
-  _N"Sets the handler function for an object set operation.")
+  "Sets the handler function for an object set operation.")
 
 
 
@@ -170,14 +170,14 @@
 	  (handler-function handler)))
 
 (defvar *descriptor-handlers* nil
-  _N"List of all the currently active handlers for file descriptors")
+  "List of all the currently active handlers for file descriptors")
 
 ;;; ADD-FD-HANDLER -- public
 ;;;
 ;;;   Add a new handler to *descriptor-handlers*.
 ;;;
 (defun add-fd-handler (fd direction function)
-  _N"Arange to call FUNCTION whenever FD is usable. DIRECTION should be
+  "Arange to call FUNCTION whenever FD is usable. DIRECTION should be
   either :INPUT or :OUTPUT. The value returned should be passed to
   SYSTEM:REMOVE-FD-HANDLER when it is no longer needed."
   (assert (member direction '(:input :output))
@@ -192,7 +192,7 @@
 ;;;   Remove an old handler from *descriptor-handlers*.
 ;;;
 (defun remove-fd-handler (handler)
-  _N"Removes HANDLER from the list of active handlers."
+  "Removes HANDLER from the list of active handlers."
   (setf *descriptor-handlers*
 	(delete handler *descriptor-handlers*
 		:test #'eq)))
@@ -202,7 +202,7 @@
 ;;;   Search *descriptor-handlers* for any reference to fd, and nuke 'em.
 ;;; 
 (defun invalidate-descriptor (fd)
-  _N"Remove any handers refering to FD. This should only be used when attempting
+  "Remove any handers refering to FD. This should only be used when attempting
   to recover from a detected inconsistency."
   (setf *descriptor-handlers*
 	(delete fd *descriptor-handlers*
@@ -213,7 +213,7 @@
 ;;; Add the handler to *descriptor-handlers* for the duration of BODY.
 ;;;
 (defmacro with-fd-handler ((fd direction function) &rest body)
-  _N"Establish a handler with SYSTEM:ADD-FD-HANDLER for the duration of BODY.
+  "Establish a handler with SYSTEM:ADD-FD-HANDLER for the duration of BODY.
    DIRECTION should be either :INPUT or :OUTPUT, FD is the file descriptor to
    use, and FUNCTION is the function to call whenever FD is usable."
   (let ((handler (gensym)))
@@ -289,7 +289,7 @@
 ;;; the meantime.
 ;;;
 (defun wait-until-fd-usable (fd direction &optional timeout)
-  _N"Wait until FD is usable for DIRECTION. DIRECTION should be either :INPUT or
+  "Wait until FD is usable for DIRECTION. DIRECTION should be either :INPUT or
   :OUTPUT. TIMEOUT, if supplied, is the number of seconds to wait before giving
   up."
   (declare (type (or real null) timeout))
@@ -336,7 +336,7 @@
 
 
 (defvar *display-event-handlers* nil
-  _N"This is an alist mapping displays to user functions to be called when
+  "This is an alist mapping displays to user functions to be called when
    SYSTEM:SERVE-EVENT notices input on a display connection.  Do not modify
    this directly; use EXT:ENABLE-CLX-EVENT-HANDLING.  A given display
    should be represented here only once.")
@@ -347,7 +347,7 @@
 ;;; pending events are processed before returning.
 ;;;
 (defun serve-all-events (&optional timeout)
-  _N"SERVE-ALL-EVENTS calls SERVE-EVENT with the specified timeout.  If
+  "SERVE-ALL-EVENTS calls SERVE-EVENT with the specified timeout.  If
   SERVE-EVENT does something (returns T) it loops over SERVE-EVENT with timeout
   0 until all events have been served.  SERVE-ALL-EVENTS returns T if
   SERVE-EVENT did something and NIL if not."
@@ -362,7 +362,7 @@
 ;;;   Serve a single event.
 ;;;
 (defun serve-event (&optional timeout)
-  _N"Receive on all ports and Xevents and dispatch to the appropriate handler
+  "Receive on all ports and Xevents and dispatch to the appropriate handler
   function.  If timeout is specified, server will wait the specified time (in
   seconds) and then return, otherwise it will wait until something happens.
   Server returns T if something happened and NIL otherwise."
diff --git a/code/sharpm.lisp b/code/sharpm.lisp
index 84bbb047a6e03044fed3f381f73a47528fcb0ccc..41b392effe8500028dc68aaaaffdbbdb4f0046c9 100644
--- a/code/sharpm.lisp
+++ b/code/sharpm.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sharpm.lisp,v 1.28 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sharpm.lisp,v 1.29 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -130,7 +130,7 @@
 ;;;; #. handling.
 
 (defvar *read-eval* t
-  _N"If false, then the #. read macro is disabled.")
+  "If false, then the #. read macro is disabled.")
 
 (defun sharp-dot (stream sub-char numarg)
   (ignore-numarg sub-char numarg)
diff --git a/code/signal.lisp b/code/signal.lisp
index d785b17b47d34af4e439c87688c1e962e6123087..9f2d51872c3438976476526d235a1b4924275e2c 100644
--- a/code/signal.lisp
+++ b/code/signal.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/signal.lisp,v 1.37 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/signal.lisp,v 1.38 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -50,7 +50,7 @@
   (%description nil :type string))  ; Documentation
 
 (defvar *unix-signals* nil
-  _N"A list of unix signal structures.")
+  "A list of unix signal structures.")
 
 
 (eval-when (compile eval)
@@ -78,17 +78,17 @@
     signal))
 
 (defun unix-signal-name (signal)
-  _N"Return the name of the signal as a string.  Signal should be a valid
+  "Return the name of the signal as a string.  Signal should be a valid
   signal number or a keyword of the standard UNIX signal name."
   (symbol-name (unix-signal-%name (unix-signal-or-lose signal))))
 
 (defun unix-signal-description (signal)
-  _N"Return a string describing signal.  Signal should be a valid signal
+  "Return a string describing signal.  Signal should be a valid signal
   number or a keyword of the standard UNIX signal name."
   (unix-signal-%description (unix-signal-or-lose signal)))
 
 (defun unix-signal-number (signal)
-  _N"Return the number of the given signal.  Signal should be a valid
+  "Return the number of the given signal.  Signal should be a valid
   signal number or a keyword of the standard UNIX signal name."
   (unix-signal-%number (unix-signal-or-lose signal)))
 
@@ -156,7 +156,7 @@
 ;;; SIGMASK -- Public
 ;;;
 (defmacro sigmask (&rest signals)
-  _N"Returns a mask given a set of signals."
+  "Returns a mask given a set of signals."
   (apply #'logior
 	 (mapcar #'(lambda (signal)
 		     (ash 1 (1- (unix-signal-number signal))))
@@ -172,7 +172,7 @@
   (signal c-call:int))
 
 (defun unix-kill (pid signal)
-  _N"Unix-kill sends the signal signal to the process with process 
+  "Unix-kill sends the signal signal to the process with process 
    id pid.  Signal should be a valid signal number or a keyword of the
    standard UNIX signal name."
   (if (minusp (real-unix-kill pid (unix-signal-number signal)))
@@ -186,7 +186,7 @@
   (signal c-call:int))
 
 (defun unix-killpg (pgrp signal)
-  _N"Unix-killpg sends the signal signal to the all the process in process
+  "Unix-killpg sends the signal signal to the all the process in process
   group PGRP.  Signal should be a valid signal number or a keyword of
   the standard UNIX signal name."
   (if (minusp (real-unix-killpg pgrp (unix-signal-number signal)))
@@ -194,21 +194,21 @@
       t))
 
 (alien:def-alien-routine ("sigblock" unix-sigblock) c-call:unsigned-long
-  _N"Unix-sigblock cause the signals specified in mask to be
+  "Unix-sigblock cause the signals specified in mask to be
    added to the set of signals currently being blocked from
    delivery.  The macro sigmask is provided to create masks."
   (mask c-call:unsigned-long))
 
 
 (alien:def-alien-routine ("sigpause" unix-sigpause) c-call:void
-  _N"Unix-sigpause sets the set of masked signals to its argument
+  "Unix-sigpause sets the set of masked signals to its argument
    and then waits for a signal to arrive, restoring the previous
    mask upon its return."
   (mask c-call:unsigned-long))
 
 
 (alien:def-alien-routine ("sigsetmask" unix-sigsetmask) c-call:unsigned-long
-  _N"Unix-sigsetmask sets the current set of masked signals (those
+  "Unix-sigsetmask sets the current set of masked signals (those
    being blocked from delivery) to the argument.  The macro sigmask
    can be used to create the mask.  The previous value of the signal
    mask is returned."
@@ -282,7 +282,7 @@
   (throw 'lisp::top-level-catcher nil))
 
 (defun signal-init ()
-  _N"Enable all the default signals that Lisp knows how to deal with."
+  "Enable all the default signals that Lisp knows how to deal with."
   (unless (member "-monitor" lisp::lisp-command-line-list :test #'string=)
     (enable-interrupt :sigint #'sigint-handler))
   (enable-interrupt :sigquit #'sigquit-handler)
@@ -342,7 +342,7 @@
 ;;; WITHOUT-INTERRUPTS  --  puiblic
 ;;; 
 (defmacro without-interrupts (&body body)
-  _N"Execute BODY in a context impervious to interrupts."
+  "Execute BODY in a context impervious to interrupts."
   (let ((name (gensym)))
     `(flet ((,name () ,@body))
        (if *interrupts-enabled*
@@ -356,7 +356,7 @@
 ;;; WITH-INTERRUPTS  --  puiblic
 ;;;
 (defmacro with-interrupts (&body body)
-  _N"Allow interrupts while executing BODY.  As interrupts are normally allowed,
+  "Allow interrupts while executing BODY.  As interrupts are normally allowed,
   this is only useful inside a WITHOUT-INTERRUPTS."
   (let ((name (gensym)))
     `(flet ((,name () ,@body))
@@ -395,7 +395,7 @@
 ;;;; WITH-ENABLED-INTERRUPTS
 
 (defmacro with-enabled-interrupts (interrupt-list &body body)
-  _N"With-enabled-interrupts ({(interrupt function)}*) {form}*
+  "With-enabled-interrupts ({(interrupt function)}*) {form}*
    Establish function as a handler for the Unix signal interrupt which
    should be a number between 1 and 31 inclusive."
   (let ((il (gensym))
diff --git a/code/sort.lisp b/code/sort.lisp
index 539752b1892dd58a956f9a8373c49f9642ab39f2..df04b14985b5cbfd77d8615044421db210e47cef 100644
--- a/code/sort.lisp
+++ b/code/sort.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sort.lisp,v 1.11 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sort.lisp,v 1.12 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -26,7 +26,7 @@
 
 
 (defun sort (sequence predicate &key key)
-  _N"Destructively sorts sequence.  Predicate should returns non-Nil if
+  "Destructively sorts sequence.  Predicate should returns non-Nil if
    Arg1 is to precede Arg2."
   (typecase sequence
     (simple-vector
@@ -133,7 +133,7 @@
 ;;;; Stable Sorting
 
 (defun stable-sort (sequence predicate &key key)
-  _N"Destructively sorts sequence.  Predicate should returns non-Nil if
+  "Destructively sorts sequence.  Predicate should returns non-Nil if
    Arg1 is to precede Arg2."
   (typecase sequence
     (simple-vector
@@ -424,7 +424,7 @@
 ) ; eval-when
 
 (defun merge (result-type sequence1 sequence2 predicate &key key)
-  _N"The sequences Sequence1 and Sequence2 are destructively merged into
+  "The sequences Sequence1 and Sequence2 are destructively merged into
    a sequence of type Result-Type using the Predicate to order the elements."
   (cond ((or (eq result-type 'list)
 	     (subtypep result-type 'list))
diff --git a/code/sparc-svr4-vm.lisp b/code/sparc-svr4-vm.lisp
index b72cb1ad235833cf24d2a86e2f2468fce2ded95e..c6af1da93c00a2cbdf27f6385df621a231386eaf 100644
--- a/code/sparc-svr4-vm.lisp
+++ b/code/sparc-svr4-vm.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sparc-svr4-vm.lisp,v 1.14 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sparc-svr4-vm.lisp,v 1.15 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -137,7 +137,7 @@
 ;;;; MACHINE-TYPE and MACHINE-VERSION
 
 (defun machine-type ()
-  _N"Returns a string describing the type of the local machine."
+  "Returns a string describing the type of the local machine."
   ;; Helps cross-compile from a different system that might not have
   ;; unix:unix-sysinfo.
   (if (fboundp (find-symbol "UNIX-SYSINFO" "UNIX"))
@@ -146,7 +146,7 @@
       "sun4"))
 
 (defun machine-version ()
-  _N"Returns a string describing the version of the local machine."
+  "Returns a string describing the version of the local machine."
   (if (fboundp (find-symbol "UNIX-SYSINFO" "UNIX"))
       (funcall (find-symbol "UNIX-SYSINFO" "UNIX")
 	       (symbol-value (find-symbol "SI-PLATFORM" "UNIX")))
diff --git a/code/stream-vector-io.lisp b/code/stream-vector-io.lisp
index 2039af12d60f7bfa486cd5fda9bc77817ac8a5fe..11b3463f57539665ade5116bf1b7051b5fd7c0de 100644
--- a/code/stream-vector-io.lisp
+++ b/code/stream-vector-io.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/stream-vector-io.lisp,v 1.7 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/stream-vector-io.lisp,v 1.8 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -176,7 +176,7 @@
 
 ;;; READ-VECTOR --
 (defun read-vector (vector stream &key (start 0) end (endian-swap :byte-8))
-  _N"Read from Stream into Vector.  The Start and End indices of Vector
+  "Read from Stream into Vector.  The Start and End indices of Vector
   is in octets, and must be an multiple of the octets per element of
   the vector element.  The keyword argument :Endian-Swap specifies any
   endian swapping to be done. "
@@ -213,7 +213,7 @@
 ;;; WRITE VECTOR --
 ;;; returns the next octet-position in vector.
 (defun write-vector (vector stream &key (start 0) (end nil) (endian-swap :byte-8))
-  _N"Write Vector to Stream.  The Start and End indices of Vector is in
+  "Write Vector to Stream.  The Start and End indices of Vector is in
   octets, and must be an multiple of the octets per element of the
   vector element.  The keyword argument :Endian-Swap specifies any
   endian swapping to be done. "
diff --git a/code/stream.lisp b/code/stream.lisp
index 6e0e1845f273d101c46e4db12192e3574b498c80..ce6df2eca55b8b760dc73570f156d63e51164828 100644
--- a/code/stream.lisp
+++ b/code/stream.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/stream.lisp,v 1.90 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/stream.lisp,v 1.91 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -55,13 +55,13 @@
 ;;; The initialization of these streams is performed by Stream-Init,
 ;;; which lives in the file of machine-specific stream functions.
 ;;;
-(defvar *terminal-io* () _N"Terminal I/O stream.")
-(defvar *standard-input* () _N"Default input stream.")
-(defvar *standard-output* () _N"Default output stream.")
-(defvar *error-output* () _N"Error output stream.")
-(defvar *query-io* () _N"Query I/O stream.")
-(defvar *trace-output* () _N"Trace output stream.")
-(defvar *debug-io* () _N"Interactive debugging stream.")
+(defvar *terminal-io* () "Terminal I/O stream.")
+(defvar *standard-input* () "Default input stream.")
+(defvar *standard-output* () "Default output stream.")
+(defvar *error-output* () "Error output stream.")
+(defvar *query-io* () "Query I/O stream.")
+(defvar *trace-output* () "Trace output stream.")
+(defvar *debug-io* () "Interactive debugging stream.")
 
 (defun ill-in-any (stream &rest ignore)
   (declare (ignore ignore))
@@ -207,7 +207,7 @@
 ;;; Stream manipulation functions.
 
 (defun input-stream-p (stream)
-  _N"Returns non-nil if the given Stream can perform input operations."
+  "Returns non-nil if the given Stream can perform input operations."
   (declare (type stream stream))
   ;; Note: Gray streams redefines this function; any changes made here need
   ;; to be duplicated in .../pcl/gray-streams.lisp
@@ -224,7 +224,7 @@
 	       (not (eq (lisp-stream-n-bin stream) #'ill-n-bin)))))))
 
 (defun output-stream-p (stream)
-  _N"Returns non-nil if the given Stream can perform output operations."
+  "Returns non-nil if the given Stream can perform output operations."
   (declare (type stream stream))
   ;; Note: Gray streams redefines this function; any changes made here need
   ;; to be duplicated in .../pcl/gray-streams.lisp
@@ -240,7 +240,7 @@
 	       (not (eq (lisp-stream-bout stream) #'ill-bout)))))))
 
 (defun open-stream-p (stream)
-  _N"Return true if Stream is not closed."
+  "Return true if Stream is not closed."
   (declare (type stream stream))
   ;; Note: Gray streams redefines this function; any changes made here need
   ;; to be duplicated in .../pcl/gray-streams.lisp
@@ -251,7 +251,7 @@
     (not (eq (lisp-stream-in stream) #'closed-flame))))
 
 (defun stream-element-type (stream)
-  _N"Returns a type specifier for the kind of object returned by the Stream."
+  "Returns a type specifier for the kind of object returned by the Stream."
   (declare (type stream stream))
   ;; Note: Gray streams redefines this function; any changes made here need
   ;; to be duplicated in .../pcl/gray-streams.lisp
@@ -262,7 +262,7 @@
     (funcall (lisp-stream-misc stream) stream :element-type)))
 
 (defun interactive-stream-p (stream)
-  _N"Return true if Stream does I/O on a terminal or other interactive device."
+  "Return true if Stream does I/O on a terminal or other interactive device."
   (declare (type stream stream))
   (stream-dispatch stream
     ;; simple-stream
@@ -285,7 +285,7 @@
 	   :format-arguments (list stream))))
 
 (defun stream-external-format (stream)
-  _N"Returns the external format used by the given Stream."
+  "Returns the external format used by the given Stream."
   (declare (type stream stream))
   (stream-dispatch stream
     ;; simple-stream
@@ -314,7 +314,7 @@
   extfmt)
 
 (defun close (stream &key abort)
-  _N"Closes the given Stream.  No more I/O may be performed, but inquiries
+  "Closes the given Stream.  No more I/O may be performed, but inquiries
   may still be made.  If :Abort is non-nil, an attempt is made to clean
   up the side effects of having created the stream."
   (declare (type stream stream))
@@ -347,7 +347,7 @@
 ;;;    Call the misc method with the :file-position operation.
 ;;;
 (defun file-position (stream &optional position)
-  _N"With one argument returns the current position within the file
+  "With one argument returns the current position within the file
    File-Stream is open to.  If the second argument is supplied, then
    this becomes the new file position.  The second argument may also
    be :start or :end for the start and end of the file, respectively."
@@ -373,7 +373,7 @@
 ;;;    Like File-Position, only use :file-length.
 ;;;
 (defun file-length (stream)
-  _N"This function returns the length of the file that File-Stream is open to."
+  "This function returns the length of the file that File-Stream is open to."
   (stream-dispatch stream
     ;; simple-stream
     (stream::%file-length stream)
@@ -385,7 +385,7 @@
 
 (defun read-line (&optional (stream *standard-input*) (eof-errorp t) eof-value
 			    recursive-p)
-  _N"Returns a line of text read from the Stream as a string, discarding the
+  "Returns a line of text read from the Stream as a string, discarding the
   newline character."
   (let ((stream (in-synonym-of stream)))
     (stream-dispatch stream
@@ -431,7 +431,7 @@
 (declaim (inline read-char unread-char read-byte listen))
 (defun read-char (&optional (stream *standard-input*) (eof-errorp t) eof-value
 			    recursive-p)
-  _N"Inputs a character from Stream and returns it."
+  "Inputs a character from Stream and returns it."
   (let ((stream (in-synonym-of stream)))
     (stream-dispatch stream
       ;; simple-stream
@@ -448,7 +448,7 @@
 	    char)))))
 
 (defun unread-char (character &optional (stream *standard-input*))
-  _N"Puts the Character back on the front of the input Stream."
+  "Puts the Character back on the front of the input Stream."
   (let ((stream (in-synonym-of stream)))
     (stream-dispatch stream
       ;; simple-stream
@@ -545,7 +545,7 @@
 
 (defun peek-char (&optional (peek-type nil) (stream *standard-input*)
 			    (eof-errorp t) eof-value recursive-p)
-  _N"Peeks at the next character in the input Stream.  See manual for details."
+  "Peeks at the next character in the input Stream.  See manual for details."
   ;; FIXME: The type of PEEK-TYPE is also declared in a DEFKNOWN, but
   ;; the compiler doesn't seem to be smart enough to go from there to
   ;; imposing a type check. Figure out why (because PEEK-TYPE is an
@@ -586,7 +586,7 @@
 	   :eof-detected-form (eof-or-lose stream eof-errorp eof-value))))))
 
 (defun listen (&optional (stream *standard-input*) (width 1))
-  _N"Returns T if a character is available on the given Stream."
+  "Returns T if a character is available on the given Stream."
   (declare (type streamlike stream))
   (let ((stream (in-synonym-of stream)))
     (stream-dispatch stream
@@ -601,7 +601,7 @@
 
 (defun read-char-no-hang (&optional (stream *standard-input*)
 				    (eof-errorp t) eof-value recursive-p)
-  _N"Returns the next character from the Stream if one is available, or nil."
+  "Returns the next character from the Stream if one is available, or nil."
   (let ((stream (in-synonym-of stream)))
     (stream-dispatch stream
       ;; simple-stream
@@ -619,7 +619,7 @@
 
 
 (defun clear-input (&optional (stream *standard-input*) buffer-only)
-  _N"Clears any buffered input associated with the Stream."
+  "Clears any buffered input associated with the Stream."
   (declare (type streamlike stream))
   (let ((stream (in-synonym-of stream)))
     (stream-dispatch stream
@@ -634,7 +634,7 @@
   nil)
 
 (defun read-byte (stream &optional (eof-errorp t) eof-value)
-  _N"Returns the next byte of the Stream."
+  "Returns the next byte of the Stream."
   (declare (type stream stream))
   (let ((stream (in-synonym-of stream)))
     (stream-dispatch stream
@@ -652,7 +652,7 @@
 	    char)))))
 
 (defun read-n-bytes (stream buffer start numbytes &optional (eof-errorp t))
-  _N"Reads Numbytes bytes into the Buffer starting at Start, returning the number
+  "Reads Numbytes bytes into the Buffer starting at Start, returning the number
    of bytes read.
    -- If EOF-ERROR-P is true, an END-OF-FILE condition is signalled if
       end-of-file is encountered before Count bytes have been read.
@@ -817,7 +817,7 @@
 ;;; Output functions:
 
 (defun write-char (character &optional (stream *standard-output*))
-  _N"Outputs the Character to the Stream."
+  "Outputs the Character to the Stream."
   (declare (type streamlike stream))
   (let ((stream (out-synonym-of stream)))
     (stream-dispatch stream
@@ -830,7 +830,7 @@
   character)
 
 (defun terpri (&optional (stream *standard-output*))
-  _N"Outputs a new line to the Stream."
+  "Outputs a new line to the Stream."
   (declare (type streamlike stream))
   (let ((stream (out-synonym-of stream)))
     (stream-dispatch stream
@@ -843,7 +843,7 @@
   nil)
 
 (defun fresh-line (&optional (stream *standard-output*))
-  _N"Outputs a new line to the Stream if it is not positioned at the beginning of
+  "Outputs a new line to the Stream if it is not positioned at the beginning of
    a line.  Returns T if it output a new line, nil otherwise."
   (declare (type streamlike stream))
   (let ((stream (out-synonym-of stream)))
@@ -859,7 +859,7 @@
 
 (defun write-string (string &optional (stream *standard-output*)
 			    &key (start 0) end)
-  _N"Outputs the String to the given Stream."
+  "Outputs the String to the given Stream."
   (write-string* string stream start (or end (length (the vector string)))))
 
 (defun write-string* (string &optional (stream *standard-output*)
@@ -886,7 +886,7 @@
 
 (defun write-line (string &optional (stream *standard-output*)
 			  &key (start 0) (end (length string)))
-  _N"Outputs the String to the given Stream, followed by a newline character."
+  "Outputs the String to the given Stream, followed by a newline character."
   (write-line* string stream start (or end (length string))))
 
 (defun write-line* (string &optional (stream *standard-output*)
@@ -918,7 +918,7 @@
     string))
 
 (defun charpos (&optional (stream *standard-output*))
-  _N"Returns the number of characters on the current line of output of the given
+  "Returns the number of characters on the current line of output of the given
   Stream, or Nil if that information is not availible."
   (declare (type streamlike stream))
   (let ((stream (out-synonym-of stream)))
@@ -931,7 +931,7 @@
       (stream-line-column stream))))
 
 (defun line-length (&optional (stream *standard-output*))
-  _N"Returns the number of characters that will fit on a line of output on the
+  "Returns the number of characters that will fit on a line of output on the
   given Stream, or Nil if that information is not available."
   (declare (type streamlike stream))
   (let ((stream (out-synonym-of stream)))
@@ -944,7 +944,7 @@
       (stream-line-length stream))))
 
 (defun finish-output (&optional (stream *standard-output*))
-  _N"Attempts to ensure that all output sent to the Stream has reached its
+  "Attempts to ensure that all output sent to the Stream has reached its
    destination, and only then returns."
   (declare (type streamlike stream))
   (let ((stream (out-synonym-of stream)))
@@ -958,7 +958,7 @@
   nil)
 
 (defun force-output (&optional (stream *standard-output*))
-  _N"Attempts to force any buffered output to be sent."
+  "Attempts to force any buffered output to be sent."
   (declare (type streamlike stream))
   (let ((stream (out-synonym-of stream)))
     (stream-dispatch stream
@@ -971,7 +971,7 @@
   nil)
 
 (defun clear-output (&optional (stream *standard-output*))
-  _N"Clears the given output Stream."
+  "Clears the given output Stream."
   (declare (type streamlike stream))
   (let ((stream (out-synonym-of stream)))
     (stream-dispatch stream
@@ -984,7 +984,7 @@
   nil)
 
 (defun write-byte (integer stream)
-  _N"Outputs the Integer to the binary Stream."
+  "Outputs the Integer to the binary Stream."
   (declare (type stream stream))
   (let ((stream (out-synonym-of stream)))
     (stream-dispatch stream
@@ -1050,7 +1050,7 @@
   (streams () :type list :read-only t))
 
 (defun make-broadcast-stream (&rest streams)
-  _N"Returns an output stream which sends its output to all of the given
+  "Returns an output stream which sends its output to all of the given
 streams."
   (dolist (s streams)
     (unless (output-stream-p s)
@@ -1224,7 +1224,7 @@ streams."
 	  (two-way-stream-output-stream s)))
 
 (defun make-two-way-stream (input-stream output-stream)
-  _N"Returns a bidirectional stream which gets its input from Input-Stream and
+  "Returns a bidirectional stream which gets its input from Input-Stream and
    sends its output to Output-Stream."
   (unless (input-stream-p input-stream)
     (ill-in-any input-stream))
@@ -1310,7 +1310,7 @@ streams."
 	  (concatenated-stream-streams s)))
 
 (defun make-concatenated-stream (&rest streams)
-  _N"Returns a stream which takes its input from each of the Streams in turn,
+  "Returns a stream which takes its input from each of the Streams in turn,
    going on to the next at EOF."
   (dolist (s streams)
     (unless (input-stream-p s)
@@ -1395,7 +1395,7 @@ streams."
   unread-stuff)
 
 (defun make-echo-stream (input-stream output-stream)
-  _N"Returns an echo stream that takes input from Input-stream and sends
+  "Returns an echo stream that takes input from Input-stream and sends
 output to Output-stream"
   (unless (input-stream-p input-stream)
     (ill-in-any input-stream))
@@ -1612,7 +1612,7 @@ output to Output-stream"
   
 (defun make-string-input-stream (string &optional
 					(start 0) (end (length string)))
-  _N"Returns an input stream which will supply the characters of String between
+  "Returns an input stream which will supply the characters of String between
   Start and End in order."
   (declare (type string string)
 	   (type index start)
@@ -1639,7 +1639,7 @@ output to Output-stream"
   (write-string "#<String-Output Stream>" stream))
 
 (defun make-string-output-stream (&key (element-type 'character))
-  _N"Returns an Output stream which will accumulate all output given to it for
+  "Returns an Output stream which will accumulate all output given to it for
    the benefit of the function Get-Output-Stream-String."
   (declare (ignore element-type))
   (%make-string-output-stream))
@@ -1699,7 +1699,7 @@ output to Output-stream"
      (set-closed-flame stream))))
 
 (defun get-output-stream-string (stream)
-  _N"Returns a string of all the characters sent to a stream made by
+  "Returns a string of all the characters sent to a stream made by
    Make-String-Output-Stream since the last call to this function."
   (declare (type string-output-stream stream))
   (let* ((length (string-output-stream-index stream))
@@ -1709,7 +1709,7 @@ output to Output-stream"
     result))
 
 (defun dump-output-stream-string (in-stream out-stream)
-  _N"Dumps the characters buffer up in the In-Stream to the Out-Stream as
+  "Dumps the characters buffer up in the In-Stream to the Out-Stream as
   Get-Output-Stream-String would return them."
   (write-string* (string-output-stream-string in-stream) out-stream
 		 0 (string-output-stream-index in-stream))
@@ -1904,7 +1904,7 @@ output to Output-stream"
   (target (required-argument) :type stream))
 
 (defun make-case-frob-stream (target kind)
-  _N"Returns a stream that sends all output to the stream TARGET, but modifies
+  "Returns a stream that sends all output to the stream TARGET, but modifies
    the case of letters, depending on KIND, which should be one of:
      :upcase - convert to upper case.
      :downcase - convert to lower case.
@@ -2153,7 +2153,7 @@ output to Output-stream"
 ;;; LISTEN fails, then we have some random stream we must wait on.
 ;;;
 (defun get-stream-command (stream)
-  _N"This takes a stream and waits for text or a command to appear on it.  If
+  "This takes a stream and waits for text or a command to appear on it.  If
    text appears before a command, this returns nil, and otherwise it returns
    a command."
   (let ((cmdp (funcall (lisp-stream-misc stream) stream :get-command)))
@@ -2168,7 +2168,7 @@ output to Output-stream"
 ;;; READ-SEQUENCE --
 
 (defun read-sequence (seq stream &key (start 0) (end nil) partial-fill)
-  _N"Destructively modify SEQ by reading elements from STREAM.
+  "Destructively modify SEQ by reading elements from STREAM.
 
   Seq is bounded by Start and End. Seq is destructively modified by
   copying successive elements into it from Stream. If the end of file
@@ -2536,7 +2536,7 @@ output to Output-stream"
 ;;; will always puzzle me.
 
 (defun write-sequence (seq stream &key (start 0) (end nil))
-  _N"Writes the elements of the Seq bounded by Start and End to Stream.
+  "Writes the elements of the Seq bounded by Start and End to Stream.
 
   Argument(s):
   SEQ:     a proper SEQUENCE
diff --git a/code/string.lisp b/code/string.lisp
index 3ad6dd0a5f80cc0e3aeb9116aed1359fdc1b4c09..1164c54cdc552ab004f08f8e5ac3b0eedde7eee4 100644
--- a/code/string.lisp
+++ b/code/string.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/string.lisp,v 1.22 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/string.lisp,v 1.23 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -35,7 +35,7 @@
 (declaim (inline surrogatep surrogates-to-codepoint codepoint surrogates))
 
 (defun surrogatep (char-or-code &optional surrogate-type)
-  _N"Test if C is a surrogate.  C may be either an integer or a
+  "Test if C is a surrogate.  C may be either an integer or a
   character. Surrogate-type indicates what kind of surrogate to test
   for.  :High means to test for the high (leading) surrogate; :Low
   tests for the low (trailing surrogate).  A value of :Any or Nil
@@ -56,14 +56,14 @@
        (= #b11011 (ash code -11))))))
 
 (defun surrogates-to-codepoint (hi-surrogate-char lo-surrogate-char)
-  _N"Convert the given Hi and Lo surrogate characters to the
+  "Convert the given Hi and Lo surrogate characters to the
   corresponding codepoint value"
   (declare (type character hi-surrogate-char lo-surrogate-char))
   (+ (ash (- (the (integer #xD800 #xDBFF) (char-code hi-surrogate-char)) #xD800) 10)
      (the (integer #xDC00 #xDFFF) (char-code lo-surrogate-char)) #x2400))
 
 (defun codepoint (string i &optional (end (length string)))
-  _N"Return the codepoint value from String at position I.  If that
+  "Return the codepoint value from String at position I.  If that
   position is a surrogate, it is combined with either the previous or
   following character (when possible) to compute the codepoint.  The
   second return value is NIL if the position is not a surrogate pair.
@@ -84,7 +84,7 @@
 	  (t (values code nil)))))
 
 (defun surrogates (codepoint)
-  _N"Return the high and low surrogate characters for Codepoint.  If
+  "Return the high and low surrogate characters for Codepoint.  If
   Codepoint is in the BMP, the first return value is the corresponding
   character and the second is NIL."
   (declare (type codepoint codepoint))
@@ -96,7 +96,7 @@
 	(values (code-char hi) (code-char lo)))))
 
 (defun (setf codepoint) (codepoint string i)
-  _N"Set the codepoint at string position I to the Codepoint.  If the
+  "Set the codepoint at string position I to the Codepoint.  If the
   codepoint requires a surrogate pair, the high (leading surrogate) is
   stored at position I and the low (trailing) surrogate is stored at
   I+1"
@@ -136,7 +136,7 @@
       (when wide (incf index)))))
 
 (defun string (X)
-  _N"Coerces X into a string.  If X is a string, X is returned.  If X is a
+  "Coerces X into a string.  If X is a string, X is returned.  If X is a
   symbol, X's pname is returned.  If X is a character then a one element
   string containing that character is returned.  If X cannot be coerced
   into a string, an error occurs."
@@ -202,7 +202,7 @@
 
 
 (defun char (string index)
-  _N"Given a string and a non-negative integer index less than the length of
+  "Given a string and a non-negative integer index less than the length of
   the string, returns the character object representing the character at
   that position in the string."
   (declare (optimize (safety 1)))
@@ -213,7 +213,7 @@
   (setf (char string index) new-el))
 
 (defun schar (string index)
-  _N"SCHAR returns the character object at an indexed position in a string
+  "SCHAR returns the character object at an indexed position in a string
   just as CHAR does, except the string must be a simple-string."
   (declare (optimize (safety 1)))
   (schar string index))
@@ -305,38 +305,38 @@
 
 
 (defun string< (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings, if the first string is lexicographically less than
+  "Given two strings, if the first string is lexicographically less than
   the second string, returns the longest common prefix (using char=)
   of the two strings. Otherwise, returns ()."
   (string<* string1 string2 start1 end1 start2 end2))
 
 (defun string> (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings, if the first string is lexicographically greater than
+  "Given two strings, if the first string is lexicographically greater than
   the second string, returns the longest common prefix (using char=)
   of the two strings. Otherwise, returns ()."
   (string>* string1 string2 start1 end1 start2 end2))
 
 
 (defun string<= (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings, if the first string is lexicographically less than
+  "Given two strings, if the first string is lexicographically less than
   or equal to the second string, returns the longest common prefix
   (using char=) of the two strings. Otherwise, returns ()."
   (string<=* string1 string2 start1 end1 start2 end2))
 
 (defun string>= (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings, if the first string is lexicographically greater
+  "Given two strings, if the first string is lexicographically greater
   than or equal to the second string, returns the longest common prefix
   (using char=) of the two strings. Otherwise, returns ()."
   (string>=* string1 string2 start1 end1 start2 end2))
 
 (defun string= (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings (string1 and string2), and optional integers start1,
+  "Given two strings (string1 and string2), and optional integers start1,
   start2, end1 and end2, compares characters in string1 to characters in
   string2 (using char=)."
   (string=* string1 string2 start1 end1 start2 end2))
 
 (defun string/= (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings, if the first string is not lexicographically equal
+  "Given two strings, if the first string is not lexicographically equal
   to the second string, returns the longest common prefix (using char=)
   of the two strings. Otherwise, returns ()."
   (string/=* string1 string2 start1 end1 start2 end2))
@@ -399,7 +399,7 @@
 	     (write-string (unicode-case-fold-full code) s))))))))
 
 (defun string-equal (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings (string1 and string2), and optional integers start1,
+  "Given two strings (string1 and string2), and optional integers start1,
   start2, end1 and end2, compares characters in string1 to characters in
   string2 (using char-equal)."
   (declare (fixnum start1 start2))
@@ -415,7 +415,7 @@
 	  (string-not-equal-loop 1 t nil)))))
 
 (defun string-not-equal (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings, if the first string is not lexicographically equal
+  "Given two strings, if the first string is not lexicographically equal
   to the second string, returns the longest common prefix (using char-equal)
   of the two strings. Otherwise, returns ()."
   (with-two-strings string1 string2 start1 end1 offset1 start2 end2
@@ -552,33 +552,33 @@
   (string-less-greater-equal t t))
 
 (defun string-lessp (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings, if the first string is lexicographically less than
+  "Given two strings, if the first string is lexicographically less than
   the second string, returns the longest common prefix (using char-equal)
   of the two strings. Otherwise, returns ()."
   (string-lessp* string1 string2 start1 end1 start2 end2))
 
 (defun string-greaterp (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings, if the first string is lexicographically greater than
+  "Given two strings, if the first string is lexicographically greater than
   the second string, returns the longest common prefix (using char-equal)
   of the two strings. Otherwise, returns ()."
   (string-greaterp* string1 string2 start1 end1 start2 end2))
 
 (defun string-not-lessp (string1 string2 &key (start1 0) end1 (start2 0) end2)
-  _N"Given two strings, if the first string is lexicographically greater
+  "Given two strings, if the first string is lexicographically greater
   than or equal to the second string, returns the longest common prefix
   (using char-equal) of the two strings. Otherwise, returns ()."
   (string-not-lessp* string1 string2 start1 end1 start2 end2))
 
 (defun string-not-greaterp (string1 string2 &key (start1 0) end1 (start2 0)
 				    end2)
-  _N"Given two strings, if the first string is lexicographically less than
+  "Given two strings, if the first string is lexicographically less than
   or equal to the second string, returns the longest common prefix
   (using char-equal) of the two strings. Otherwise, returns ()."
   (string-not-greaterp* string1 string2 start1 end1 start2 end2))
 
 
 (defun make-string (count &key element-type ((:initial-element fill-char)))
-  _N"Given a character count and an optional fill character, makes and returns
+  "Given a character count and an optional fill character, makes and returns
   a new string Count long filled with the fill character."
   (declare (type fixnum count))
   (assert (subtypep element-type 'character))
@@ -867,7 +867,7 @@
 	  (string-capitalize-full string :start start :end end))))
 
 (defun nstring-upcase (string &key (start 0) end)
-  _N"Given a string, returns that string with all lower case alphabetic
+  "Given a string, returns that string with all lower case alphabetic
   characters converted to uppercase."
   (declare (fixnum start))
   (let ((save-header string))
@@ -894,7 +894,7 @@
     save-header))
 
 (defun nstring-downcase (string &key (start 0) end)
-  _N"Given a string, returns that string with all upper case alphabetic
+  "Given a string, returns that string with all upper case alphabetic
   characters converted to lowercase."
   (declare (fixnum start))
   (let ((save-header string))
@@ -919,7 +919,7 @@
     save-header))
 
 (defun nstring-capitalize (string &key (start 0) end)
-  _N"Given a string, returns that string with the first
+  "Given a string, returns that string with the first
   character of each ``word'' converted to upper-case, and remaining
   chars in the word converted to lower case. A ``word'' is defined
   to be a string of case-modifiable characters delimited by
@@ -986,7 +986,7 @@
 	    (when widep (incf index)))))))
 
 (defun string-left-trim (char-bag string)
-  _N"Given a set of characters (a list or string) and a string, returns
+  "Given a set of characters (a list or string) and a string, returns
   a copy of the string with the characters in the set removed from the
   left end.  If the set of characters is a string, surrogates will be
   properly handled."
@@ -1034,7 +1034,7 @@
 	    (when widep (decf index)))))))
 
 (defun string-right-trim (char-bag string)
-  _N"Given a set of characters (a list or string) and a string, returns
+  "Given a set of characters (a list or string) and a string, returns
   a copy of the string with the characters in the set removed from the
   right end.  If the set of characters is a string, surrogates will be
   properly handled."
@@ -1044,7 +1044,7 @@
       (subseq string start stop))))
 
 (defun string-trim (char-bag string)
-  _N"Given a set of characters (a list or string) and a string, returns a
+  "Given a set of characters (a list or string) and a string, returns a
   copy of the string with the characters in the set removed from both
   ends.  If the set of characters is a string, surrogates will be
   properly handled."
@@ -1133,7 +1133,7 @@
 ) ; unicode
 
 (defun glyph (string index &key (from-end nil))
-  _N"GLYPH returns the glyph at the indexed position in a string, and the
+  "GLYPH returns the glyph at the indexed position in a string, and the
   position of the next glyph (or NIL) as a second value.  A glyph is
   a substring consisting of the character at INDEX followed by all
   subsequent combining characters."
@@ -1149,7 +1149,7 @@
 	  (values (subseq string index n) (and (< n (length string)) n))))))
 
 (defun sglyph (string index &key (from-end nil))
-  _N"SGLYPH returns the glyph at the indexed position, the same as GLYPH,
+  "SGLYPH returns the glyph at the indexed position, the same as GLYPH,
   except that the string must be a simple-string"
   (declare (type simple-string string) (type kernel:index index))
   #-unicode
@@ -1338,17 +1338,17 @@
 	(shrink-vector target comp-pos)))))
 
 (defun string-to-nfd (string)
-  _N"Convert String to Unicode Normalization Form D (NFD) using the
+  "Convert String to Unicode Normalization Form D (NFD) using the
   canonical decomposition.  The NFD string is returned"
   (decompose string nil))
 
 (defun string-to-nfkd (string)
-  _N"Convert String to Unicode Normalization Form KD (NFKD) uisng the
+  "Convert String to Unicode Normalization Form KD (NFKD) uisng the
   compatible decomposition form.  The NFKD string is returned."
   (decompose string t))
 
 (defun string-to-nfc (string)
-  _N"Convert String to Unicode Normalization Form C (NFC).  If the
+  "Convert String to Unicode Normalization Form C (NFC).  If the
   string a simple string and is already normalized, the original
   string is returned."
   (if (normalized-form-p string :nfc)
@@ -1359,7 +1359,7 @@
 	      'simple-string)))
 
 (defun string-to-nfkc (string)
-  _N"Convert String to Unicode Normalization Form KC (NFKC).  If the
+  "Convert String to Unicode Normalization Form KC (NFKC).  If the
   string is a simple string and is already normalized, the original
   string is returned."
   (if (normalized-form-p string :nfkc)
diff --git a/code/struct.lisp b/code/struct.lisp
index 2fe53fae60f47b5e050381821fa2c3286774df3e..c0722336facf854faf1279ed2e9deae0c13b927b 100644
--- a/code/struct.lisp
+++ b/code/struct.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/struct.lisp,v 1.23 2010/03/19 15:18:59 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/struct.lisp,v 1.24 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -17,7 +17,7 @@
 
 ;;;; The stream structure:
 
-(defconstant in-buffer-length 512 _N"The size of a stream in-buffer.")
+(defconstant in-buffer-length 512 "The size of a stream in-buffer.")
 (deftype in-buffer-type ()
   `(simple-array (unsigned-byte 8) (,in-buffer-length)))
 
diff --git a/code/sunos-os.lisp b/code/sunos-os.lisp
index 7c31804ecb55c46af109ad8c4e417e7ff3d45491..953668a2a5322a92d31ac8ef84487839a56326c6 100644
--- a/code/sunos-os.lisp
+++ b/code/sunos-os.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sunos-os.lisp,v 1.13 2010/03/19 15:19:00 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sunos-os.lisp,v 1.14 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -26,10 +26,10 @@
 
 (setq *software-type* "SunOS")
 
-(defvar *software-version* nil _N"Version string for supporting software")
+(defvar *software-version* nil "Version string for supporting software")
 
 (defun software-version ()
-  _N"Returns a string describing version of the supporting software."
+  "Returns a string describing version of the supporting software."
   (unless *software-version*
     (setf *software-version*
 	  (multiple-value-bind (sysname nodename release version)
diff --git a/code/symbol.lisp b/code/symbol.lisp
index 8f84353ef8fe21736f649f05a19d61df57865750..3a46c037ad37d7f3b56da61619fc65bc578eb021 100644
--- a/code/symbol.lisp
+++ b/code/symbol.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/symbol.lisp,v 1.43 2010/04/16 01:28:37 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/symbol.lisp,v 1.44 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -33,18 +33,18 @@
 (declaim (maybe-inline get %put getf remprop %putf get-properties keywordp))
 
 (defun symbol-value (variable)
-  _N"VARIABLE must evaluate to a symbol.  This symbol's current special
+  "VARIABLE must evaluate to a symbol.  This symbol's current special
   value is returned."
   (declare (optimize (safety 1)))
   (symbol-value variable))
 
 (defun boundp (variable)
-  _N"VARIABLE must evaluate to a symbol.  Return NIL if this symbol is
+  "VARIABLE must evaluate to a symbol.  Return NIL if this symbol is
   unbound, T if it has a value."
   (boundp variable))
 
 (defun set (variable new-value)
-  _N"VARIABLE must evaluate to a symbol.  This symbol's special value cell is
+  "VARIABLE must evaluate to a symbol.  This symbol's special value cell is
   set to the specified new value."
   (declare (type symbol variable))
   (cond ((null variable)
@@ -61,14 +61,14 @@
   (%set-symbol-value symbol new-value))
 
 (defun makunbound (variable)
-  _N"VARIABLE must evaluate to a symbol.  This symbol is made unbound,
+  "VARIABLE must evaluate to a symbol.  This symbol is made unbound,
   removing any value it may currently have."
   (set variable
        (%primitive make-other-immediate-type 0 vm:unbound-marker-type))
   variable)
 
 (defun symbol-function (variable)
-  _N"VARIABLE must evaluate to a symbol.  This symbol's current definition
+  "VARIABLE must evaluate to a symbol.  This symbol's current definition
    is returned.  Settable with SETF."
   (raw-definition variable))
 
@@ -78,18 +78,18 @@
 
 
 (defun symbol-plist (variable)
-  _N"VARIABLE must evaluate to a symbol.  Return its property list."
+  "VARIABLE must evaluate to a symbol.  Return its property list."
   (symbol-plist variable))
 
 (defun %set-symbol-plist (symbol new-value)
   (setf (symbol-plist symbol) new-value))
 
 (defun symbol-name (variable)
-  _N"VARIABLE must evaluate to a symbol.  Return its print name."
+  "VARIABLE must evaluate to a symbol.  Return its print name."
   (symbol-name variable))
 
 (defun symbol-package (variable)
-  _N"VARIABLE must evaluate to a symbol.  Return its package."
+  "VARIABLE must evaluate to a symbol.  Return its package."
   (symbol-package variable))
 
 (defun %set-symbol-package (symbol package)
@@ -97,7 +97,7 @@
   (%set-symbol-package symbol package))
 
 (defun make-symbol (string)
-  _N"Make and return a new symbol with the STRING as its print name."
+  "Make and return a new symbol with the STRING as its print name."
   #-(or gengc x86 amd64 sparc ppc) (make-symbol string)
   #+gengc (%make-symbol (random most-positive-fixnum) string)
   ;; Initialize the symbol-hash to -1 to make this fast.  It will get
@@ -109,7 +109,7 @@
 
 #+(or gengc x86 amd64 sparc ppc)
 (defun symbol-hash (symbol)
-  _N"Return the hash value for symbol."
+  "Return the hash value for symbol."
   (symbol-hash symbol))
 
 #+(or sparc ppc)
@@ -117,7 +117,7 @@
   (kernel::%set-symbol-hash symbol hash))
 
 (defun get (symbol indicator &optional (default nil))
-  _N"Look on the property list of SYMBOL for the specified INDICATOR.  If this
+  "Look on the property list of SYMBOL for the specified INDICATOR.  If this
   is found, return the associated value, else return DEFAULT."
   (do ((pl (symbol-plist symbol) (cddr pl)))
       ((atom pl) default)
@@ -128,7 +128,7 @@
 	   (return (cadr pl))))))
 
 (defun %put (symbol indicator value)
-  _N"The VALUE is added as a property of SYMBOL under the specified INDICATOR.
+  "The VALUE is added as a property of SYMBOL under the specified INDICATOR.
   Returns VALUE."
   (do ((pl (symbol-plist symbol) (cddr pl)))
       ((endp pl)
@@ -143,7 +143,7 @@
 	   (return value)))))
 
 (defun remprop (symbol indicator)
-  _N"Look on property list of SYMBOL for property with specified
+  "Look on property list of SYMBOL for property with specified
   INDICATOR.  If found, splice this indicator and its value out of
   the plist, and return the tail of the original list starting with
   INDICATOR.  If not found, return () with no side effects.
@@ -167,7 +167,7 @@
     (and result (evenp result))))
 
 (defun getf (place indicator &optional (default ()))
-  _N"Searches the property list stored in Place for an indicator EQ to Indicator.
+  "Searches the property list stored in Place for an indicator EQ to Indicator.
   If one is found, the corresponding value is returned, else the Default is
   returned."
   (do ((plist place (cddr plist)))
@@ -192,7 +192,7 @@
 
 
 (defun get-properties (place indicator-list)
-  _N"Like GETF, except that Indicator-List is a list of indicators which will
+  "Like GETF, except that Indicator-List is a list of indicators which will
   be looked for in the property list stored in Place.  Three values are
   returned, see manual for details."
   (do ((plist place (cddr plist)))
@@ -207,7 +207,7 @@
 	   (return (values (car plist) (cadr plist) plist))))))
 
 (defun copy-symbol (symbol &optional (copy-props nil) &aux new-symbol)
-  _N"Make and return a new uninterned symbol with the same print name
+  "Make and return a new uninterned symbol with the same print name
   as SYMBOL.  If COPY-PROPS is false, the new symbol is neither bound
   nor fbound and has no properties, else it has a copy of SYMBOL's
   function, value and property list."
@@ -223,7 +223,7 @@
 (declaim (special *keyword-package*))
 
 (defun keywordp (object)
-  _N"Returns true if Object is a symbol in the keyword package."
+  "Returns true if Object is a symbol in the keyword package."
   (and (symbolp object)
        (eq (symbol-package object) *keyword-package*)))
 
@@ -231,11 +231,11 @@
 ;;;; Gensym and friends.
 
 (defvar *gensym-counter* 0
-  _N"Counter for generating unique GENSYM symbols.")
+  "Counter for generating unique GENSYM symbols.")
 (declaim (type unsigned-byte *gensym-counter*))
 
 (defun gensym (&optional (thing "G"))
-  _N"Creates a new uninterned symbol whose name is a prefix string (defaults
+  "Creates a new uninterned symbol whose name is a prefix string (defaults
    to \"G\"), followed by a decimal number.  Thing, when supplied, will
    alter the prefix if it is a string, or be used for the decimal number
    if it is a number, of this symbol. The default value of the number is
@@ -264,7 +264,7 @@
 (declaim (type index *gentemp-counter*))
 
 (defun gentemp (&optional (prefix "T") (package *package*))
-  _N"Creates a new symbol interned in package Package with the given Prefix."
+  "Creates a new symbol interned in package Package with the given Prefix."
   (loop
     (let* ((*print-base* 10)
 	   (*print-radix* nil)
diff --git a/code/sysmacs.lisp b/code/sysmacs.lisp
index 5a83374312e79aff2a6e464f834e7d6562f4c672..caeabd321c16d266ee1c74c925372ae50705b4b9 100644
--- a/code/sysmacs.lisp
+++ b/code/sysmacs.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sysmacs.lisp,v 1.32 2010/03/19 15:19:00 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/sysmacs.lisp,v 1.33 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -20,11 +20,11 @@
 	  register-lisp-feature register-lisp-runtime-feature))
 
 (defmacro register-lisp-feature (feature)
-  _N"Register the feature as having influenced the CMUCL build process."
+  "Register the feature as having influenced the CMUCL build process."
   `(pushnew ,feature *features*))
 
 (defmacro register-lisp-runtime-feature (feature)
-  _N"Register the feature as having influenced the CMUCL build process,
+  "Register the feature as having influenced the CMUCL build process,
 and also the CMUCL C runtime."
   (let ((f (gensym)))
     `(progn
@@ -47,7 +47,7 @@ and also the CMUCL C runtime."
 			    (start-var &optional (svalue 0))
 			    (end-var &optional (evalue nil)))
 			   &rest forms)
-  _N"Given any Array, binds Data-Var to the array's data vector and Start-Var and
+  "Given any Array, binds Data-Var to the array's data vector and Start-Var and
   End-Var to the start and end of the designated portion of the data vector.
   Svalue and Evalue are any start and end specified to the original operation,
   and are factored into the bindings of Start-Var and End-Var.  Offset-Var is
@@ -72,7 +72,7 @@ and also the CMUCL C runtime."
 
 #-gengc
 (defmacro without-gcing (&rest body)
-  _N"Executes the forms in the body without doing a garbage collection."
+  "Executes the forms in the body without doing a garbage collection."
   `(unwind-protect
        (let ((*gc-inhibit* t))
 	 ,@body)
diff --git a/code/time.lisp b/code/time.lisp
index 84bb052c94d62386a227608003e8fb5fdedf3fd7..8fab44320dd69935e24f9c73a8c5ac9315b77ca9 100644
--- a/code/time.lisp
+++ b/code/time.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/time.lisp,v 1.31 2010/03/19 15:19:00 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/time.lisp,v 1.32 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -23,7 +23,7 @@
 	  get-decoded-time encode-universal-time decode-universal-time))
 
 (defconstant internal-time-units-per-second 100
-  _N"The number of internal time units that fit into a second.  See
+  "The number of internal time units that fit into a second.  See
   Get-Internal-Real-Time and Get-Internal-Run-Time.")
 
 (defconstant micro-seconds-per-internal-time-unit
@@ -42,7 +42,7 @@
 ;;; Get-Internal-Real-Time  --  Public
 ;;;
 (defun get-internal-real-time ()
-  _N"Return the real time in the internal time format.  This is useful for
+  "Return the real time in the internal time format.  This is useful for
   finding elapsed time.  See Internal-Time-Units-Per-Second."
   (locally (declare (optimize (speed 3) (safety 0)))
     (multiple-value-bind (ignore seconds useconds) (unix:unix-gettimeofday)
@@ -129,21 +129,21 @@
 ;;;
 ;;;
 (defun get-universal-time ()
-  _N"Returns a single integer for the current time of
+  "Returns a single integer for the current time of
    day in universal time format."
   (multiple-value-bind (res secs) (unix:unix-gettimeofday)
     (declare (ignore res))
     (+ secs unix-to-universal-time)))
 
 (defun get-decoded-time ()
-  _N"Returns nine values specifying the current time as follows:
+  "Returns nine values specifying the current time as follows:
    second, minute, hour, date, month, year, day of week (0 = Monday), T
    (daylight savings times) or NIL (standard time), and timezone."
   (decode-universal-time (get-universal-time)))
 
 
 (defun decode-universal-time (universal-time &optional time-zone)
-  _N"Converts a universal-time to decoded time format returning the following
+  "Converts a universal-time to decoded time format returning the following
    nine values: second, minute, hour, date, month, year, day of week (0 =
    Monday), T (daylight savings time) or NIL (standard time), and timezone.
    Completely ignores daylight-savings-time when time-zone is supplied."
@@ -216,7 +216,7 @@
 ;;;
 (defun encode-universal-time (second minute hour date month year
 				     &optional time-zone)
-  _N"The time values specified in decoded format are converted to 
+  "The time values specified in decoded format are converted to 
    universal time, which is returned."
   (declare (type (mod 60) second)
 	   (type (mod 60) minute)
@@ -252,7 +252,7 @@
 ;;;; Time:
 
 (defmacro time (form)
-  _N"Evaluates the Form and prints timing information on *Trace-Output*."
+  "Evaluates the Form and prints timing information on *Trace-Output*."
   `(%time #'(lambda () ,form)))
 
 ;;; MASSAGE-TIME-FUNCTION  --  Internal
diff --git a/code/type.lisp b/code/type.lisp
index 84f6baf43e517165a671bff5083397029b60b328..fb715c8b1c72bdf0ad376c9152ef79b7f839c53c 100644
--- a/code/type.lisp
+++ b/code/type.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/type.lisp,v 1.82 2010/03/19 15:19:00 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/type.lisp,v 1.83 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -367,7 +367,7 @@
 
 ;;;
 (defvar *use-implementation-types* t
-  _N"*Use-Implementation-Types* is a semi-public flag which determines how
+  "*Use-Implementation-Types* is a semi-public flag which determines how
    restrictive we are in determining type membership.  If two types are the
    same in the implementation, then we will consider them them the same when
    this switch is on.  When it is off, we try to be as restrictive as the
@@ -1157,7 +1157,7 @@
 	
 
 (defparameter *union-length-threshold* 50
-  _N"The maximum length of a union of integer types before we take a
+  "The maximum length of a union of integer types before we take a
   short cut and return a simpler union.")
 	    
 (defun simplify-unions (types)
@@ -3509,11 +3509,11 @@
 (deftype atom () '(not cons))
 
 (deftype extended-char ()
-  _N"Type of characters that aren't base-char's.  None in CMU CL."
+  "Type of characters that aren't base-char's.  None in CMU CL."
   '(and character (not base-char)))
 
 (deftype standard-char ()
-  _N"Type corresponding to the charaters required by the standard."
+  "Type corresponding to the charaters required by the standard."
   '(member #\NEWLINE #\SPACE #\! #\" #\# #\$ #\% #\& #\' #\( #\) #\* #\+ #\,
 	   #\- #\. #\/ #\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9 #\: #\; #\< #\=
 	   #\> #\?  #\@ #\A #\B #\C #\D #\E #\F #\G #\H #\I #\J #\K #\L #\M
@@ -3523,7 +3523,7 @@
 	   #\| #\} #\~))
 
 (deftype keyword ()
-  _N"Type for any keyword symbol."
+  "Type for any keyword symbol."
   '(and symbol (satisfies keywordp)))
 
 (deftype eql (n) `(member ,n))
diff --git a/code/typedefs.lisp b/code/typedefs.lisp
index 65c7ddb6748ec56e7bf287694e529f953ab0374e..2e42fc61a0f22ab5f8e2e282b911606ac6e3837a 100644
--- a/code/typedefs.lisp
+++ b/code/typedefs.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/typedefs.lisp,v 1.15 2010/03/19 15:19:00 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/typedefs.lisp,v 1.16 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -61,7 +61,7 @@
 (eval-when (compile load eval)
 
 (defparameter cold-type-init-forms nil
-  _N"Forms that must happen before top level forms are run.")
+  "Forms that must happen before top level forms are run.")
 
 (defmacro with-cold-load-init-forms ()
   '(eval-when (compile eval)
@@ -234,7 +234,7 @@
 ;;;
 (defmacro define-type-method ((class method &rest more-methods)
 			      lambda-list &body body)
-  _N"DEFINE-TYPE-METHOD (Class-Name Method-Name+) Lambda-List Form*"
+  "DEFINE-TYPE-METHOD (Class-Name Method-Name+) Lambda-List Form*"
   (let ((name (symbolicate CLASS "-" method "-TYPE-METHOD")))
     `(progn
        (defun ,name ,lambda-list ,@body)
@@ -250,7 +250,7 @@
 ;;; DEFINE-TYPE-CLASS  --  Interface
 ;;;
 (defmacro define-type-class (name &optional inherits)
-  _N"DEFINE-TYPE-CLASS Name [Inherits]"
+  "DEFINE-TYPE-CLASS Name [Inherits]"
   `(cold-load-init
      ,(once-only ((n-class (if inherits
 			       `(copy-type-class (type-class-or-lose ',inherits))
diff --git a/code/weak.lisp b/code/weak.lisp
index 89295dd3dfe4e85681c096b6fb964cf98a878921..bf77cbbe5fe9f23a01722d0b7fa13072a7553afd 100644
--- a/code/weak.lisp
+++ b/code/weak.lisp
@@ -5,11 +5,11 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/weak.lisp,v 1.7 2010/03/19 15:19:00 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/weak.lisp,v 1.8 2010/04/19 02:18:04 rtoy Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/weak.lisp,v 1.7 2010/03/19 15:19:00 rtoy Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/weak.lisp,v 1.8 2010/04/19 02:18:04 rtoy Rel $
 ;;;
 ;;; Weak Pointer Support.
 ;;;
@@ -23,13 +23,13 @@
 (export '(weak-pointer weak-pointer-p make-weak-pointer weak-pointer-value))
 
 (defun make-weak-pointer (object)
-  _N"Allocates and returns a weak pointer which points to OBJECT."
+  "Allocates and returns a weak pointer which points to OBJECT."
   (declare (values weak-pointer))
   (make-weak-pointer object))
 
 (declaim (inline weak-pointer-value))
 (defun weak-pointer-value (weak-pointer)
-  _N"If WEAK-POINTER is valid, returns the value of WEAK-POINTER and T.
+  "If WEAK-POINTER is valid, returns the value of WEAK-POINTER and T.
    If the referent of WEAK-POINTER has been garbage collected, returns
    the values NIL and NIL."
   (declare (type weak-pointer weak-pointer)
@@ -44,7 +44,7 @@
 
 (declaim (inline (setf weak-pointer-value)))
 (defun (setf weak-pointer-value) (object weak-pointer)
-  _N"Updates WEAK-POINTER to point to a new object."
+  "Updates WEAK-POINTER to point to a new object."
   (declare (type weak-pointer weak-pointer))
   (c::%set-weak-pointer-broken weak-pointer nil)
   (c::%set-weak-pointer-value weak-pointer object))
diff --git a/code/wire.lisp b/code/wire.lisp
index 9a07bc4401d224424f892e4b2da013728b3fec6f..4c3d681fef5ca795fed965f5ed740ebcb0359363 100644
--- a/code/wire.lisp
+++ b/code/wire.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/wire.lisp,v 1.14 2010/03/19 15:19:00 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/wire.lisp,v 1.15 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -53,19 +53,19 @@
 
 
 (defvar *current-wire* nil
-  _N"The wire the form we are currently evaluating came across.")
+  "The wire the form we are currently evaluating came across.")
 
 (defvar *this-host* nil
-  _N"Unique identifier for this host.")
+  "Unique identifier for this host.")
 (defvar *this-pid* nil
-  _N"Unique identifier for this process.")
+  "Unique identifier for this process.")
 
 (defvar *object-to-id* (make-hash-table :test 'eq)
-  _N"Hash table mapping local objects to the corresponding remote id.")
+  "Hash table mapping local objects to the corresponding remote id.")
 (defvar *id-to-object* (make-hash-table :test 'eql)
-  _N"Hash table mapping remote id's to the curresponding local object.")
+  "Hash table mapping remote id's to the curresponding local object.")
 (defvar *next-id* 0
-  _N"Next available id for remote objects.")
+  "Next available id for remote objects.")
 
 
 (defstruct (wire
@@ -132,7 +132,7 @@
 ;;; *this-pid*
 
 (defun remote-object-local-p (remote)
-  _N"Returns T iff the given remote object is defined locally."
+  "Returns T iff the given remote object is defined locally."
   (declare (type remote-object remote))
   (unless *this-host*
     (setf *this-host* (unix:unix-gethostid))
@@ -147,7 +147,7 @@
 ;;; numbers).
 
 (defun remote-object-eq (remote1 remote2)
-  _N"Returns T iff the two objects refer to the same (eq) object in the same
+  "Returns T iff the two objects refer to the same (eq) object in the same
   process."
   (declare (type remote-object remote1 remote2))
   (and (eql (remote-object-host remote1)
@@ -165,7 +165,7 @@
 ;;; on the local object.
 
 (defun remote-object-value (remote)
-  _N"Return the associated value for the given remote object. It is an error if
+  "Return the associated value for the given remote object. It is an error if
   the remote object was not created in this process or if
   FORGET-REMOTE-TRANSLATION has been called on this remote object."
   (declare (type remote-object remote))
@@ -190,7 +190,7 @@
 ;;; tables.
 
 (defun make-remote-object (local)
-  _N"Convert the given local object to a remote object."
+  "Convert the given local object to a remote object."
   (unless *this-host*
     (setf *this-host* (unix:unix-gethostid))
     (setf *this-pid* (unix:unix-getpid)))
@@ -210,7 +210,7 @@
 ;;; from the *id-to-object* hashtable.
 
 (defun forget-remote-translation (local)
-  _N"Forget the translation from the given local to the corresponding remote
+  "Forget the translation from the given local to the corresponding remote
 object. Passing that remote object to remote-object-value will new return NIL."
   (let ((id (gethash local *object-to-id*)))
     (when id
@@ -226,7 +226,7 @@ object. Passing that remote object to remote-object-value will new return NIL."
 ;;;   If nothing is in the current input buffer, select on the file descriptor.
 
 (defun wire-listen (wire)
-  _N"Return T iff anything is in the input buffer or available on the socket."
+  "Return T iff anything is in the input buffer or available on the socket."
   (or (< (wire-ibuf-offset wire)
 	 (wire-ibuf-end wire))
       (multiple-value-bind
@@ -251,7 +251,7 @@ object. Passing that remote object to remote-object-value will new return NIL."
 ;;; data, set the ibuf-end index.
 
 (defun fill-input-buffer (wire)
-  _N"Read data off the socket, filling the input buffer. The buffer is cleared
+  "Read data off the socket, filling the input buffer. The buffer is cleared
 first. If fill-input-buffer returns, it is guarenteed that there will be at
 least one byte in the input buffer. If EOF was reached, as wire-eof error
 is signaled."
@@ -285,7 +285,7 @@ is signaled."
 ;;; the input offset index.
 
 (defun wire-get-byte (wire)
-  _N"Return the next byte from the wire."
+  "Return the next byte from the wire."
   (when (<= (wire-ibuf-end wire)
 	    (wire-ibuf-offset wire))
     (fill-input-buffer wire))
@@ -299,7 +299,7 @@ is signaled."
 ;;;   Just read four bytes and pack them together with normal math ops.
 
 (defun wire-get-number (wire &optional (signed t))
-  _N"Read a number off the wire. Numbers are 4 bytes in network order.
+  "Read a number off the wire. Numbers are 4 bytes in network order.
 The optional argument controls weather or not the number should be considered
 signed (defaults to T)."
   (let* ((b1 (wire-get-byte wire))
@@ -317,7 +317,7 @@ signed (defaults to T)."
 ;;; Extracts a number, which might be a bignum.
 ;;;
 (defun wire-get-bignum (wire)
-  _N"Reads an arbitrary integer sent by WIRE-OUTPUT-BIGNUM from the wire and
+  "Reads an arbitrary integer sent by WIRE-OUTPUT-BIGNUM from the wire and
    return it."
   (let ((count-and-sign (wire-get-number wire)))
     (do ((count (abs count-and-sign) (1- count))
@@ -334,7 +334,7 @@ signed (defaults to T)."
 ;;; the entire string.
 
 (defun wire-get-string (wire)
-  _N"Reads a string from the wire. The first four bytes spec the size."
+  "Reads a string from the wire. The first four bytes spec the size."
   (let* ((length (wire-get-number wire))
 	 (result (make-string length))
 	 (offset 0)
@@ -372,7 +372,7 @@ signed (defaults to T)."
 ;;; to read the necessary data. Note, funcall objects are funcalled.
 
 (defun wire-get-object (wire)
-  _N"Reads the next object from the wire and returns it."
+  "Reads the next object from the wire and returns it."
   (let ((identifier (wire-get-byte wire))
 	(*current-wire* wire))
     (declare (fixnum identifier))
@@ -503,7 +503,7 @@ signed (defaults to T)."
 ;;;   Output any stuff remaining in the output buffer.
 
 (defun wire-force-output (wire)
-  _N"Send any info still in the output buffer down the wire and clear it. Nothing
+  "Send any info still in the output buffer down the wire and clear it. Nothing
 harmfull will happen if called when the output buffer is empty."
   (unless (zerop (wire-obuf-end wire))
     (write-stuff (wire-fd wire)
@@ -518,7 +518,7 @@ harmfull will happen if called when the output buffer is empty."
 ;;; buffer using WIRE-FORCE-OUTPUT.
 
 (defun wire-output-byte (wire byte)
-  _N"Output the given (8-bit) byte on the wire."
+  "Output the given (8-bit) byte on the wire."
   (declare (integer byte))
   (let ((fill-pointer (wire-obuf-end wire))
 	(obuf (wire-obuf wire)))
@@ -536,7 +536,7 @@ harmfull will happen if called when the output buffer is empty."
 ;;; because we just crank out the low 32 bits.
 ;;;
 (defun wire-output-number (wire number)
-  _N"Output the given (32-bit) number on the wire."
+  "Output the given (32-bit) number on the wire."
   (declare (integer number))
   (wire-output-byte wire (+ 0 (ldb (byte 8 24) number)))
   (wire-output-byte wire (ldb (byte 8 16) number))
@@ -549,7 +549,7 @@ harmfull will happen if called when the output buffer is empty."
 ;;; Output an arbitrary integer.
 ;;; 
 (defun wire-output-bignum (wire number)
-  _N"Outputs an arbitrary integer, but less effeciently than WIRE-OUTPUT-NUMBER."
+  "Outputs an arbitrary integer, but less effeciently than WIRE-OUTPUT-NUMBER."
   (do ((digits 0 (1+ digits))
        (remaining (abs number) (ash remaining -32))
        (words nil (cons (ldb (byte 32 0) remaining) words)))
@@ -567,7 +567,7 @@ harmfull will happen if called when the output buffer is empty."
 ;;; followed by the bytes of the string.
 ;;;
 (defun wire-output-string (wire string)
-  _N"Output the given string. First output the length using WIRE-OUTPUT-NUMBER,
+  "Output the given string. First output the length using WIRE-OUTPUT-NUMBER,
 then output the bytes."
   (declare (simple-string string))
   (let ((length (length string)))
@@ -600,7 +600,7 @@ then output the bytes."
 ;;; Caching defaults to yes for symbols, and nil for everything else.
 
 (defun wire-output-object (wire object &optional (cache-it (symbolp object)))
-  _N"Output the given object on the given wire. If cache-it is T, enter this
+  "Output the given object on the given wire. If cache-it is T, enter this
 object in the cache for future reference."
   (let ((cache-index (gethash object
 			      (wire-object-hash wire))))
@@ -651,7 +651,7 @@ object in the cache for future reference."
 ;;; lexical environment of the WIRE-OUTPUT-FUNCALL.
 
 (defmacro wire-output-funcall (wire-form function &rest args)
-  _N"Send the function and args down the wire as a funcall."
+  "Send the function and args down the wire as a funcall."
   (let ((num-args (length args))
 	(wire (gensym)))
     `(let ((,wire ,wire-form))
diff --git a/code/x86-vm.lisp b/code/x86-vm.lisp
index b9b51c9833db09ee558867538ac77d7de4aa8da6..d15a19b79eb0e233fc1102cc5c7cda36cd021f70 100644
--- a/code/x86-vm.lisp
+++ b/code/x86-vm.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/x86-vm.lisp,v 1.33 2010/03/19 15:19:00 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/x86-vm.lisp,v 1.34 2010/04/19 02:18:04 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -387,36 +387,36 @@
 (defun %instance-set-conditional (object slot test-value new-value)
   (declare (type instance object)
 	   (type index slot))
-  _N"Atomically compare object's slot value to test-value and if EQ store
+  "Atomically compare object's slot value to test-value and if EQ store
    new-value in the slot. The original value of the slot is returned."
   (%instance-set-conditional object slot test-value new-value))
 
 (defun set-symbol-value-conditional (symbol test-value new-value)
   (declare (type symbol symbol))
-  _N"Atomically compare symbol's value to test-value and if EQ store
+  "Atomically compare symbol's value to test-value and if EQ store
   new-value in symbol's value slot and return the original value."
   (set-symbol-value-conditional symbol test-value new-value))
 
 (defun rplaca-conditional (cons test-value new-value)
   (declare (type cons cons))
-  _N"Atomically compare the car of CONS to test-value and if EQ store
+  "Atomically compare the car of CONS to test-value and if EQ store
   new-value its car and return the original value."
   (rplaca-conditional cons test-value new-value))
 
 (defun rplacd-conditional (cons test-value new-value)
   (declare (type cons cons))
-  _N"Atomically compare the cdr of CONS to test-value and if EQ store
+  "Atomically compare the cdr of CONS to test-value and if EQ store
   new-value its cdr and return the original value."
   (rplacd-conditional cons test-value new-value))
 
 (defun data-vector-set-conditional (vector index test-value new-value)
   (declare (type simple-vector vector))
-  _N"Atomically compare an element of vector to test-value and if EQ store
+  "Atomically compare an element of vector to test-value and if EQ store
   new-value the element and return the original value."
   (data-vector-set-conditional vector index test-value new-value))
 
 (defmacro atomic-push-symbol-value (val symbol)
-  _N"Thread safe push of val onto the list in the symbol global value."
+  "Thread safe push of val onto the list in the symbol global value."
   (ext:once-only ((n-val val))
     (let ((new-list (gensym))
 	  (old-list (gensym)))
@@ -430,7 +430,7 @@
 	      (return ,new-list))))))))
 
 (defmacro atomic-pop-symbol-value (symbol)
-  _N"Thread safe pop from the list in the symbol global value."
+  "Thread safe pop from the list in the symbol global value."
   (let ((new-list (gensym))
 	(old-list (gensym)))
     `(loop
@@ -442,7 +442,7 @@
 	  (return (car ,old-list)))))))
 
 (defmacro atomic-pusha (val cons)
-  _N"Thread safe push of val onto the list in the car of cons."
+  "Thread safe push of val onto the list in the car of cons."
   (once-only ((n-val val)
 	      (n-cons cons))
     (let ((new-list (gensym))
@@ -456,7 +456,7 @@
 	      (return ,new-list))))))))
 
 (defmacro atomic-pushd (val cons)
-  _N"Thread safe push of val onto the list in the cdr of cons."
+  "Thread safe push of val onto the list in the cdr of cons."
   (once-only ((n-val val)
 	      (n-cons cons))
     (let ((new-list (gensym))
@@ -470,7 +470,7 @@
 	      (return ,new-list))))))))
 
 (defmacro atomic-push-vector (val vect index)
-  _N"Thread safe push of val onto the list in the vector element."
+  "Thread safe push of val onto the list in the vector element."
   (once-only ((n-val val)
 	      (n-vect vect)
 	      (n-index index))