More clean up on string vs symbol confusions

20 files changed, 221 insertions, 227 deletions

diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 2ea52cc0..000eefb9 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -245,7 +245,7 @@ displayComp level ==
   $bright:= " << "
   $dim:= " >> "
   if $insideCapsuleFunctionIfTrue=true then
-    sayBrightly ['"error in function",:bright $op,'%l]
+    sayBrightly ['"error in function",:bright $op,'"%l"]
   --mathprint removeZeroOne mkErrorExpr level
   pp removeZeroOne mkErrorExpr level
   sayBrightly ['"****** level",:bright level,'" ******"]
@@ -352,11 +352,11 @@ intersectionContour(c,c') ==
       pair:= assoc("mode",p) =>
         pair':= assoc("mode",p') =>
           m'':= unifiable(rest pair,rest pair') => [["mode",:m'']]
-          stackSemanticError(['%b,$var,'%d,"has two modes: "],nil)
-       --stackWarning ("mode for",'%b,$var,'%d,"introduced conditionally")
+          stackSemanticError(['"%b",$var,'"%d","has two modes: "],nil)
+       --stackWarning ("mode for",'"%b",$var,'"%d","introduced conditionally")
         [["conditionalmode",:rest pair]]
         --LIST pair
-       --stackWarning ("mode for",'%b,$var,'%d,"introduced conditionally")
+       --stackWarning ("mode for",'"%b",$var,'"%d","introduced conditionally")
       pair':= assoc("mode",p') => [["conditionalmode",:rest pair']]
         --LIST pair'
     unifiable(m1,m2) ==
@@ -937,7 +937,7 @@ traceUp() ==
   atom $x => sayBrightly "$x is an atom"
   for y in rest $x repeat
     u:= comp(y,$EmptyMode,$f) =>
-      sayBrightly [y,'" ==> mode",'%b,u.mode,'%d]
+      sayBrightly [y,'" ==> mode",'"%b",u.mode,'"%d"]
     sayBrightly [y,'" does not compile"]
  
 traceDown() ==
@@ -946,25 +946,25 @@ traceDown() ==
   sayBrightly "no modemaps for $x"
  
 qModemap mm ==
-  sayBrightly ['%b,"modemap",'%d,:formatModemap mm]
+  sayBrightly ['"%b","modemap",'"%d",:formatModemap mm]
   [[dc,target,:sl],[pred,:.]]:= mm
   and/[qArg(a,m) for a in rest $x for m in sl] => target
-  sayBrightly ['%b,"fails",'%d,'%l]
+  sayBrightly ['"%b","fails",'"%d",'"%l"]
  
 qArg(a,m) ==
   yesOrNo:=
     u:= comp(a,m,$f) => "yes"
     "no"
-  sayBrightly [a," --> ",m,'%b,yesOrNo,'%d]
+  sayBrightly [a," --> ",m,'"%b",yesOrNo,'"%d"]
   yesOrNo="yes"
  
 displayProplist(x,alist) ==
-  sayBrightly ["properties of",'%b,x,'%d,":"]
+  sayBrightly ["properties of",'"%b",x,'"%d",":"]
   fn alist where
     fn alist ==
       alist is [[prop,:val],:l] =>
         if prop="value" then val:= [val.expr,val.mode,'"..."]
-        sayBrightly ["   ",'%b,prop,'%d,": ",val]
+        sayBrightly ["   ",'"%b",prop,'"%d",": ",val]
         fn deleteAssoc(prop,l)
  
 displayModemaps E ==
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index 2adb438b..db2ad360 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -365,7 +365,7 @@ clearCategoryCache catName ==
 displayHashtable x ==
   l:= nreverse SORTBY('CAR,[[opOf HGET(x,key),key] for key in HKEYS x])
   for [a,b] in l repeat
-    sayBrightlyNT ['%b,a,'%d]
+    sayBrightlyNT ['"%b",a,'"%d"]
     pp b
  
 cacheStats() ==
@@ -704,5 +704,5 @@ domainEqualList(argl1,argl2) ==
  
 removeAllClams() ==
   for [fun,:.] in $clamList repeat
-    sayBrightly ['"Un-clamming function",'%b,fun,'%d]
+    sayBrightly ['"Un-clamming function",'"%b",fun,'"%d"]
     setDynamicBinding(fun,eval INTERN strconc(STRINGIMAGE fun,'";"))
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index ef0250a6..eb0146de 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1006,8 +1006,8 @@ compMacro(form,m,e) ==
       rhs is ['CAPSULE,:.]  => ['"-- the constructor capsule"]
       rhs is ['add,:.]      => ['"-- the constructor capsule"]
       formatUnabbreviated rhs
-    sayBrightly ['"   processing macro definition",'%b,
-      :formatUnabbreviated lhs,'" ==> ",:prhs,'%d]
+    sayBrightly ['"   processing macro definition",'"%b",
+      :formatUnabbreviated lhs,'" ==> ",:prhs,'"%d"]
   m=$EmptyMode or m=$NoValueMode =>
     -- Macro names shall be identifiers.
     not IDENTP lhs.op =>
@@ -1957,8 +1957,8 @@ compMapCond'(cexpr,dc) ==
   cexpr is ["has",name,cat] => (knownInfo cexpr => true; false)
         --for the time being we'll stop here - shouldn't happen so far
         --$disregardConditionIfTrue => true
-        --stackSemanticError(("not known that",'%b,name,
-        -- '%d,"has",'%b,cat,'%d),nil)
+        --stackSemanticError(("not known that",'"%b",name,
+        -- '"%d","has",'"%b",cat,'"%d"),nil)
   --now it must be an attribute
   member(["ATTRIBUTE",dc,cexpr],get("$Information","special",$e)) => true
   --for the time being we'll stop here - shouldn't happen so far
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 2fb14a5f..a1f75041 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -800,12 +800,12 @@ displayMissingFunctions() ==
       loc := [[op,sig],:loc]
     exp := [[op,sig],:exp]
   if loc then
-    sayBrightly ['%l,:bright '"  Missing Local Functions:"]
+    sayBrightly ['"%l",:bright '"  Missing Local Functions:"]
     for [op,sig] in loc for i in 1.. repeat
       sayBrightly ['"      [",i,'"]",:bright op,
         ": ",:formatUnabbreviatedSig sig]
   if exp then
-    sayBrightly ['%l,:bright '"  Missing Exported Functions:"]
+    sayBrightly ['"%l",:bright '"  Missing Exported Functions:"]
     for [op,sig] in exp for i in 1.. repeat
       sayBrightly ['"      [",i,'"]",:bright op,
         ": ",:formatUnabbreviatedSig sig]
@@ -1123,11 +1123,11 @@ checkAndDeclare(argl,form,sig,e) ==
     m1:= getArgumentMode(a,e) =>
       not modeEqual(m1,m) =>
         stack:= ["   ",:bright a,'"must have type ",m,
-          '" not ",m1,'%l,:stack]
+          '" not ",m1,'"%l",:stack]
     e:= put(a,'mode,m,e)
   if stack then
     sayBrightly ['"   Parameters of ",:bright form.op,
-      '" are of wrong type:",'%l,:stack]
+      '" are of wrong type:",'"%l",:stack]
   e
  
 getSignature(op,argModeList,$e) ==
@@ -1214,7 +1214,7 @@ compile u ==
             DC='_$ and (opexport:=true) and
              (and/[modeEqual(x,y) for x in sig for y in $signatureOfForm])]
       isLocalFunction op =>
-        if opexport then userError ['%b,op,'%d,'" is local and exported"]
+        if opexport then userError ['"%b",op,'"%d",'" is local and exported"]
         INTERN strconc(encodeItem $prefix,'";",encodeItem op) 
       encodeFunctionName(op,$functorForm,$signatureOfForm,";",$suffix)
      where
@@ -1344,8 +1344,8 @@ bootStrapError(functorForm,sourceFile) ==
   ['COND, _
     ['$bootStrapMode, _
         ['VECTOR,mkTypeForm functorForm,nil,nil,nil,nil,nil]],
-    [''T, ['systemError,['LIST,''%b,MKQ functorForm.op,''%d,'"from", _
-      ''%b,MKQ namestring sourceFile,''%d,'"needs to be compiled"]]]]
+    [''T, ['systemError,['LIST,'"%b",MKQ functorForm.op,'"%d",'"from", _
+      '"%b",MKQ namestring sourceFile,'"%d",'"needs to be compiled"]]]]
 
 registerInlinableDomain(x,e) ==
   x := macroExpand(x,e)
@@ -1367,8 +1367,8 @@ compAdd(['add,$addForm,capsule],m,e) ==
     [['COND, _
        ['$bootStrapMode, _
            code],_
-       [''T, ['systemError,['LIST,''%b,MKQ $functorForm.op,''%d,'"from", _
-         ''%b,MKQ namestring _/EDITFILE,''%d,'"needs to be compiled"]]]],m,e]
+       [''T, ['systemError,['LIST,'"%b",MKQ $functorForm.op,'"%d",'"from", _
+         '"%b",MKQ namestring _/EDITFILE,'"%d",'"needs to be compiled"]]]],m,e]
   $addFormLhs: local:= $addForm
   if $addForm is ["SubDomain",domainForm,predicate] then
     $NRTaddForm := domainForm
diff --git a/src/interp/format.boot b/src/interp/format.boot
index b27d07ec..59e6ae49 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -60,7 +60,7 @@ displayOpModemaps(op,modemaps) ==
   TERPRI()
   count:= #modemaps
   phrase:= (count=1 => 'modemap;'modemaps)
-  sayMSG ['%b,count,'%d,phrase,'" for",'%b,op,'%d,'":"]
+  sayMSG ['"%b",count,'"%d",phrase,'" for",'"%b",op,'"%d",'":"]
   for modemap in modemaps repeat sayModemap modemap
 
 displayTranModemap (mm is [[x,:sig],[pred,:y],:z]) ==
@@ -151,20 +151,20 @@ formatModemap modemap ==
     ['"_(",:argTypeList,'"_)"]
   fromPart:=
     if dc = 'D and D
-      then concat('%b,'"from",'%d,prefix2String D)
-      else concat('%b,'"from",'%d,prefix2String dc)
+      then concat('"%b",'"from",'"%d",prefix2String D)
+      else concat('"%b",'"from",'"%d",prefix2String dc)
   firstPart:= concat('" ",argPart,'" -> ",targetPart)
   sayWidth firstPart + sayWidth fromPart > 74 => --allow 5 spaces for " [n]"
     fromPart:= concat('" ",fromPart)
     secondPart :=
       sayWidth fromPart + sayWidth predPart < 75 =>
         concat(fromPart,predPart)
-      concat(fromPart,'%l,predPart)
-    concat(firstPart,'%l,secondPart)
+      concat(fromPart,'"%l",predPart)
+    concat(firstPart,'"%l",secondPart)
   firstPart:= concat(firstPart,fromPart)
   sayWidth firstPart + sayWidth predPart < 80 =>
     concat(firstPart,predPart)
-  concat(firstPart,'%l,predPart)
+  concat(firstPart,'"%l",predPart)
 
 substInOrder(alist,x) ==
   alist is [[a,:b],:y] => substInOrder(y,substitute(b,a,x))
@@ -233,10 +233,10 @@ formatOperation([[op,sig],.,[fn,.,n]],domain) ==
   opSigString
 
 formatOpSignature(op,sig) ==
-  concat('%b,formatOpSymbol(op,sig),'%d,": ",formatSignature sig)
+  concat('"%b",formatOpSymbol(op,sig),'"%d",": ",formatSignature sig)
 
 formatOpConstant op ==
-  concat('%b,formatOpSymbol(op,'($)),'%d,'": constant")
+  concat('"%b",formatOpSymbol(op,'($)),'"%d",'": constant")
 
 formatOpSymbol(op,sig) ==
   if op = 'Zero then op := "0"
@@ -276,7 +276,7 @@ formatAttributeArg x ==
   string? x and x ='"*" => "_"*_""
   atom x => formatOpSymbol (x,nil)
   x is [":",op,["Mapping",:sig]] =>
-    concat('%b,formatOpSymbol(op,sig),": ",'%d,formatMapping sig)
+    concat('"%b",formatOpSymbol(op,sig),": ",'"%d",formatMapping sig)
   prefix2String0 x
 
 formatMapping sig ==
@@ -353,7 +353,7 @@ form2StringWithWhere u ==
   $permitWhere : local := true
   $whereList: local := nil
   s:= form2String u
-  $whereList => concat(s,'%b,'"where",'%d,"%i",$whereList,"%u")
+  $whereList => concat(s,'"%b",'"where",'"%d","%i",$whereList,'"%u")
   s
 
 form2StringWithPrens form ==
@@ -479,14 +479,14 @@ formDecl2String(left,right) ==
 formJoin1(op,u) ==
   if op = 'Join then [:argl,last] := u else (argl := nil; last := [op,:u])
   last is [id,.,:r] and id in '(mkCategory CATEGORY) =>
-    $abbreviateJoin = true => concat(formJoin2 argl,'%b,'"with",'%d,'"...")
+    $abbreviateJoin = true => concat(formJoin2 argl,'"%b",'"with",'"%d",'"...")
     $permitWhere = true =>
       opList:= formatJoinKey(r,id)
       $whereList:= concat($whereList,"%l",$declVar,": ",
-        formJoin2 argl,'%b,'"with",'%d,"%i",opList,"%u")
+        formJoin2 argl,'"%b",'"with",'"%d","%i",opList,"%u")
       formJoin2 argl
     opList:= formatJoinKey(r,id)
-    suffix := concat('%b,'"with",'%d,"%i",opList,"%u")
+    suffix := concat('"%b",'"with",'"%d","%i",opList,"%u")
     concat(formJoin2 argl,suffix)
   formJoin2 u
 
@@ -681,7 +681,7 @@ plural(n,string) ==
 formatIf pred ==
   not pred => nil
   member(pred,'(T %true (QUOTE T))) => nil
-  concat('%b,'"if",'%d,pred2English pred)
+  concat('"%b",'"if",'"%d",pred2English pred)
 
 formatPredParts s ==
   s is ['QUOTE,s1] => formatPredParts s1
@@ -709,9 +709,9 @@ pred2English x ==
   x is ['NOT,l] =>
     concat('"not ",pred2English l)
   x is [op,a,b] and op in '(_has ofCategory) =>
-    concat(pred2English a,'%b,'"has",'%d,form2String abbreviate b)
+    concat(pred2English a,'"%b",'"has",'"%d",form2String abbreviate b)
   x is [op,a,b] and op in '(HasSignature HasAttribute HasCategory) =>
-    concat(prefix2String0 formatPredParts a,'%b,'"has",'%d,
+    concat(prefix2String0 formatPredParts a,'"%b",'"has",'"%d",
       prefix2String0 formatPredParts b)
   x is [op,a,b] and op in '(ofType getDomainView) =>
     if b is ['QUOTE,b'] then b := b'
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 97e3938a..45cac30b 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -206,7 +206,7 @@ compCategories u ==
   atom v =>
     error ['"compCategories: could not get proper modemap for operator",first u]
   if rest v then
-    sayBrightly ['"compCategories: ", '%b, '"Warning", '%d,
+    sayBrightly ['"compCategories: ", '"%b", '"Warning", '"%d",
                  '"ignoring unexpected stuff at end of modemap"]
     pp rest v
   -- the next line "fixes" a bad modemap which sometimes appears ....
diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot
index 3841f295..e0c0c905 100644
--- a/src/interp/g-error.boot
+++ b/src/interp/g-error.boot
@@ -63,8 +63,8 @@ $ReadingFile := false
 
 argumentDataError(argnum, condit, funname) ==
   msg := ['"The test",:bright pred2English condit,'"evaluates to",
-    :bright '"false",'%l,'"   for argument",:bright argnum,_
-    '"to the function",:bright funname,'"and this indicates",'%l,_
+    :bright '"false",'"%l",'"   for argument",:bright argnum,_
+    '"to the function",:bright funname,'"and this indicates",'"%l",_
     '"   that the argument is not appropriate."]
   errorSupervisor($AlgebraError,msg)
 
@@ -96,7 +96,7 @@ errorSupervisor1(errorType,errorMsg,$BreakMode) ==
   msg :=
     errorMsg is ['mathprint, :.] => errorMsg
     atom errorMsg => ['"   ", errorMsg]
-    needsToSplitMessage errorMsg => rest [:['%l,'"   ",u] for u in errorMsg]
+    needsToSplitMessage errorMsg => rest [:['"%l",'"   ",u] for u in errorMsg]
     ['"   ",:errorMsg]
   sayErrorly(errorLabel, msg)
   handleLispBreakLoop($BreakMode)
@@ -111,11 +111,11 @@ handleLispBreakLoop($BreakMode) ==
     while not gotIt repeat
       gotIt := true
       msgQ := 
-       ['%l,'"   You have three options. Enter:",'%l,_
-        '"    ",:bright '"continue",'"  to continue processing,",'%l,_
-        '"    ",:bright '"top     ",'"  to return to top level, or",'%l,_
-        '"    ",:bright '"break   ",'"  to enter a LISP break loop.",'%l,_
-        '%l,'"   Please enter your choice now:"]
+       ['"%l",'"   You have three options. Enter:",'"%l",_
+        '"    ",:bright '"continue",'"  to continue processing,",'"%l",_
+        '"    ",:bright '"top     ",'"  to return to top level, or",'"%l",_
+        '"    ",:bright '"break   ",'"  to enter a LISP break loop.",'"%l",_
+        '"%l",'"   Please enter your choice now:"]
       x := STRING2ID_-N(queryUser msgQ,1)
       x := selectOptionLC(x,'(top break continue),NIL)
       null x =>
@@ -125,9 +125,9 @@ handleLispBreakLoop($BreakMode) ==
       x = 'break =>
         $BreakMode := 'break
 	sayBrightly ['"   Enter",:bright '":C",
-	  '"when you are ready to continue processing where you ",'%l,_
+	  '"when you are ready to continue processing where you ",'"%l",_
 	  '"   interrupted the system, enter",:bright '"(TOP)",_
-	  '"when you wish to return",'%l,'"   to top level.",'%l,'%l]
+	  '"when you wish to return",'"%l",'"   to top level.",'"%l",'"%l"]
         BREAK()
       sayBrightly
         '"   Processing will continue where it was interrupted."
@@ -145,7 +145,7 @@ returnToTopLevel() ==
 
 returnToReader() ==
   not $ReadingFile => returnToTopLevel()
-  sayBrightly ['"   Continuing to read the file...", '%l]
+  sayBrightly ['"   Continuing to read the file...", '"%l"]
   THROW($SpadReaderTag, nil)
 
 sayErrorly(errorLabel, msg) ==
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index 7ce9922e..8645b391 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -581,7 +581,7 @@ printableArgModeSetList() ==
   for a in reverse $origArgModeSetList repeat
     b := prefix2String first a
     if atom b then b := [b]
-    amsl := ['%l,:b,:amsl]
+    amsl := ['"%l",:b,:amsl]
   if amsl then amsl := rest amsl
   amsl
 
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index daaa481d..166ab44b 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -43,7 +43,7 @@ sayFunctionSelection(op,args,target,dc,func) ==
   fsig := formatSignatureArgs args
   if not LISTP fsig then fsig := LIST fsig
   if func then func := bright ['"by ",func]
-  sayMSG concat ['%l,:bright '"Function Selection for",op,:func,'%l,
+  sayMSG concat ['"%l",:bright '"Function Selection for",op,:func,'"%l",
     '"      Arguments:",:bright fsig]
   if target then sayMSG concat ['"      Target type:",
     :bright prefix2String target]
@@ -1050,7 +1050,7 @@ selectMmsGen(op,tar,args1,args2) ==
   mmS := NIL
 
   if $reportBottomUpFlag then
-    sayMSG ['%l,:bright '"Modemaps from Associated Packages"]
+    sayMSG ['"%l",:bright '"Modemaps from Associated Packages"]
 
   if haves then
     [havesExact,havesInexact] := exact?(haves,tar,args1)
@@ -1068,7 +1068,7 @@ selectMmsGen(op,tar,args1,args2) ==
   mmS => mmS
 
   if $reportBottomUpFlag then
-    sayMSG ['%l,:bright '"Remaining General Modemaps"]
+    sayMSG ['"%l",:bright '"Remaining General Modemaps"]
   --  for mm in havenots for i in 1.. repeat sayModemapWithNumber(mm,i)
 
   if havenots then
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 4801bbf1..c13f71cf 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -1482,7 +1482,7 @@ xLate(l,x,y,d) ==
 concatTrouble(u,d,start,lineLength,$addBlankIfTrue) ==
   [x,:l] := splitConcat(u,lineLength,true)
   null l =>
-    sayALGEBRA ['%l,'%b,'"  Too wide to Print",'%d]
+    sayALGEBRA ['"%l",'"%b",'"  Too wide to Print",'"%d"]
     THROW('output,nil)
   charybdis(fixUp x,start,lineLength)
   for y in l repeat
@@ -1588,9 +1588,9 @@ output(expr,domain) ==
        and (textwrit := compiledLookup("print", '($), TextWriter())) =>
      sayMSGNT [:bright '"AXIOM-XL",'"output:   "]
      SPADCALL(SPADCALL textwrit, expr, printfun)
-     sayMSGNT '%l
+     sayMSGNT '"%l"
 
-  sayALGEBRA [:bright '"LISP",'"output:",'%l,expr or '"NIL"]
+  sayALGEBRA [:bright '"LISP",'"output:",'"%l",expr or '"NIL"]
 
 outputNumber(start,linelength,num) ==
   if start > 1 then blnks := fillerSpaces(start-1,'" ")
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index 7b260fd9..b308aa38 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -229,7 +229,7 @@ upAlgExtension t ==
   clearDependencies(a,true)
   if $printTypeIfTrue then
     sayKeyedMsg("S2IS0003",NIL)
-    sayMSG concat ['%l,'"   ",saeTypeSynonym,'" := ",
+    sayMSG concat ['"%l",'"   ",saeTypeSynonym,'" := ",
       :prefix2String objVal saeTypeSynonymValue]
     sayMSG concat ['"   ",a,'" : ",saeTypeSynonym,'" := ",a]
   putValue(op,T2)
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 892d9601..75705805 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -276,7 +276,7 @@ clearSpad2Cmd l ==
     "and"/[selectOptionLC(opt,'(except),'optionError) =
              'except for [opt,:.] in $options]
   null l =>
-    optList:= "append"/[['%l,'"       ",x] for x in $clearOptions]
+    optList:= "append"/[['"%l",'"       ",x] for x in $clearOptions]
     sayKeyedMsg("S2IZ0010",[optList])
   arg := selectOptionLC(first l,'(all completely scaches),NIL)
   arg = 'all          => clearCmdAll()
@@ -893,7 +893,7 @@ compilerDoit(constructor, fun) ==
       _/RQ_,LIB()
       for ii in $byConstructors repeat
         null member(ii,$constructorsSeen) =>
-          sayBrightly ['">>> Warning ",'%b,ii,'%d,'" was not found"]
+          sayBrightly ['">>> Warning ",'"%b",ii,'"%d",'" was not found"]
 
 compilerDoitWithScreenedLisplib(constructor, fun) ==
     EMBED('RWRITE,
@@ -1034,9 +1034,9 @@ displaySpad2Cmd l ==
       option = "macros" =>         displayMacros vl
       option = 'names =>          displayWorkspaceNames()
       displayProperties(option,l)
-  optList:= [:['%l,'"        ",x] for x in $displayOptions]
+  optList:= [:['"%l",'"        ",x] for x in $displayOptions]
   msg := [:bright '"  )display",'"keyword arguments are",
-    :bright optList,'%l,'"   or abbreviations thereof."]
+    :bright optList,'"%l",'"   or abbreviations thereof."]
   sayMessage msg
 
 displayMacros names ==
@@ -1055,11 +1055,11 @@ displayMacros names ==
   for macro in macros repeat
     macro in pmacs =>
         if first then
-            sayBrightly ['%l,'"User-defined macros:"]
+            sayBrightly ['"%l",'"User-defined macros:"]
             first := NIL
         displayParserMacro macro
     macro in imacs => 'iterate
-    sayBrightly (["   ",'%b, macro, '%d, " is not a known OpenAxiom macro."])
+    sayBrightly (["   ",'"%b", macro, '"%d", " is not a known OpenAxiom macro."])
 
   -- now system ones
 
@@ -1068,7 +1068,7 @@ displayMacros names ==
     macro in imacs =>
         macro in pmacs => 'iterate
         if first then
-            sayBrightly ['%l,'"System-defined macros:"]
+            sayBrightly ['"%l",'"System-defined macros:"]
             first := NIL
         displayMacro macro
     macro in pmacs => 'iterate
@@ -1239,8 +1239,8 @@ displayCondition(v,condition,giveVariableIfNil) ==
   sayBrightly concat("   condition",varPart,":  ",pred2English condPart)
 
 getAndSay(v,prop) ==
-  val:= getI(v,prop) => sayMSG ["    ",val,'%l]
-  sayMSG ["    none",'%l]
+  val:= getI(v,prop) => sayMSG ["    ",val,'"%l"]
+  sayMSG ["    none",'"%l"]
 
 displayType($op,u,omitVariableNameIfTrue) ==
   null u =>
@@ -1502,7 +1502,7 @@ findFrameInRing(name) ==
   val
 
 displayFrameNames() ==
-  fs := "append"/[ ['%l,'"     ",:bright frameName f] for f in
+  fs := "append"/[ ['"%l",'"     ",:bright frameName f] for f in
     $interpreterFrameRing]
   sayKeyedMsg("S2IZ0024",[fs])
 
@@ -2461,8 +2461,8 @@ reportOpsFromUnitDirectly unitForm ==
   top:= first unitForm
   kind:= getConstructorKindFromDB top
 
-  sayBrightly concat('%b,formatOpType unitForm,
-    '%d,'"is a",'%b,kind,'%d, '"constructor.")
+  sayBrightly concat('"%b",formatOpType unitForm,
+    '"%d",'"is a",'"%b",kind,'"%d", '"constructor.")
   if not isRecordOrUnion then
     abb := getConstructorAbbreviationFromDB top
     sourceFile := getConstructorSourceFileFromDB top
@@ -2474,7 +2474,7 @@ reportOpsFromUnitDirectly unitForm ==
       '"exposed in this frame."]
     sayBrightly ['" Issue",:bright strconc('")edit ",
       namestring sourceFile),'"to see algebra source code for",
-        :bright abb,'%l]
+        :bright abb,'"%l"]
 
   for [opt] in $options repeat
     opt := selectOptionLC(opt,$showOptions,'optionError)
@@ -2532,7 +2532,7 @@ reportOpsFromLisplib(op,u) ==
   sourceFile := getConstructorSourceFileFromDB op
   sayBrightly ['" Issue",:bright strconc('")edit ",
     namestring sourceFile),
-      '"to see algebra source code for",:bright fn,'%l]
+      '"to see algebra source code for",:bright fn,'"%l"]
 
   for [opt] in $options repeat
     opt := selectOptionLC(opt,$showOptions,'optionError)
@@ -2546,7 +2546,7 @@ reportOpsFromLisplib(op,u) ==
       attList:= removeDuplicates MSORT [x for [x,:.] in
         getConstructorAttributesFromDB op]
       null attList => sayBrightly
-        concat('%b,form2String functorForm,'%d,"has no attributes.",'%l)
+        concat('"%b",form2String functorForm,'"%d","has no attributes.",'"%l")
       say2PerLine [formatAttribute x for x in attList]
       NIL
     opt = 'operations => displayOperationsFromLisplib functorForm
@@ -2872,9 +2872,9 @@ filterAndFormatConstructors(constrType,label,patterns) ==
   if patterns then
     null l =>
       sayMessage ['"   No ",label,'" with names matching patterns:",
-        '%l,'"   ",'%b,:blankList patterns,'%d]
+        '"%l",'"   ",'"%b",:blankList patterns,'"%d"]
     sayMessage [label,'" with names matching patterns:",
-      '%l,'"   ",'%b,:blankList patterns,'%d]
+      '"%l",'"   ",'"%b",:blankList patterns,'"%d"]
   l => pp2Cols l
 
 whatConstructors constrType ==
@@ -2912,15 +2912,15 @@ printLabelledList(ls,label1,label2,prefix,patterns) ==
     null patterns =>
       sayMessage ['"   No ",label1,'"-defined ",label2,'" in effect."]
     sayMessage ['"   No ",label1,'"-defined ",label2,'" satisfying patterns:",
-     '%l,'"     ",'%b,:blankList patterns,'%d]
+     '"%l",'"     ",'"%b",:blankList patterns,'"%d"]
   if patterns then
     sayMessage [label1,'"-defined ",label2,'" satisfying patterns:",
-     '%l,'"   ",'%b,:blankList patterns,'%d]
+     '"%l",'"   ",'"%b",:blankList patterns,'"%d"]
   for [syn,:comm] in ls repeat
     if SUBSTRING(syn,0,1) = '"|" then syn := SUBSTRING(syn,1,NIL)
     if syn = '"%i" then syn := '"%i "
     wid := MAX(30 - (entryWidth syn),1)
-    sayBrightly concat('%b,prefix,syn,'%d,
+    sayBrightly concat('"%b",prefix,syn,'"%d",
       fillerSpaces(wid,'"."),'" ",prefix,comm)
   sayBrightly '""
 
@@ -2933,9 +2933,9 @@ whatCommands(patterns) ==
   if patterns then
     null l =>
       sayMessage ['"No system commands at this level matching patterns:",
-        '%l,'"   ",'%b,:blankList patterns,'%d]
+        '"%l",'"   ",'"%b",:blankList patterns,'"%d"]
     sayMessage ['"System commands at this level matching patterns:",
-      '%l,'"   ",'%b,:blankList patterns,'%d]
+      '"%l",'"   ",'"%b",:blankList patterns,'"%d"]
   if l then
     sayAsManyPerLineAsPossible l
     SAY " "
@@ -2944,11 +2944,11 @@ whatCommands(patterns) ==
   nil
 
 reportWhatOptions() ==
-  optList1:= "append"/[['%l,'"        ",x] for x in $whatOptions]
+  optList1:= "append"/[['"%l",'"        ",x] for x in $whatOptions]
   sayBrightly
-    ['%b,'"  )what",'%d,'"argument keywords are",'%b,:optList1,'%d,'%l,
-      '"   or abbreviations thereof.",'%l,
-        '%l,'"   Issue",'%b,'")what ?",'%d,'"for more information."]
+    ['"%b",'"  )what",'"%d",'"argument keywords are",'"%b",:optList1,'"%d",'"%l",
+      '"   or abbreviations thereof.",'"%l",
+        '"%l",'"   Issue",'"%b",'")what ?",'"%d",'"for more information."]
 
 filterListOfStrings(patterns,names) ==
   -- names and patterns are lists of strings
@@ -3050,7 +3050,7 @@ zsystemdevelopment1(l,im) ==
       sayMessage '"   Update/patch is completed."
     null optargs =>
       sayBrightly ['"   An argument is required for",:bright opt]
-    sayMessage ['"   Unknown option:",:bright opt,"    ",'%l,
+    sayMessage ['"   Unknown option:",:bright opt,"    ",'"%l",
       '"   Available options are", _
       :bright '"c ct e ec ect cls pause update patch compare record"]
 
diff --git a/src/interp/i-util.boot b/src/interp/i-util.boot
index 820ba96b..32b134ff 100644
--- a/src/interp/i-util.boot
+++ b/src/interp/i-util.boot
@@ -133,8 +133,8 @@ Undef(:u) ==
 -- OK - thefunction is now defined
     [:u'',.]:=u
     if $reportBottomUpFlag then
-      sayMessage concat ['"   Retrospective determination of slot",'%b,
-        slot,'%d,'"of",'%b,:prefix2String domain,'%d]
+      sayMessage concat ['"   Retrospective determination of slot",'"%b",
+        slot,'"%d",'"of",'"%b",:prefix2String domain,'"%d"]
     apply(first domain'.slot,[:u'',rest domain'.slot])
   throwKeyedMsg("S2IF0008",[formatOpSignature(op,sig),domain])
  
diff --git a/src/interp/msg.boot b/src/interp/msg.boot
index 60ab5725..e5e6c950 100644
--- a/src/interp/msg.boot
+++ b/src/interp/msg.boot
@@ -115,7 +115,7 @@ processKeyedError msg ==
     getMsgTag? msg = 'old  =>                                 --temp
         erMsg := getMsgKey msg                                --temp
         if pre := getMsgPrefix? msg then                      --temp
-          erMsg := ['%b, pre, '%d, :erMsg]                    --temp
+          erMsg := ['"%b", pre, '"%d", :erMsg]                --temp
         sayBrightly ['"old msg from ",_
           CallerName 4,:erMsg]                  --temp
     msgImPr? msg =>
@@ -383,11 +383,11 @@ getPosStL msg ==
     printedFileName :=  ['"%x2",'"[",:remLine fullPrintedPos,'"]" ]
     printedLineNum  :=  ['"%x2",'"[",:remFile fullPrintedPos,'"]" ]
     printedOrigin   :=  ['"%x2",'"[",:fullPrintedPos,'"]" ]
-    howMuch  = 'ORG  => [$optKeyBlanks,:printedOrigin, '%l]
-    howMuch  = 'LINE => [$optKeyBlanks,:printedLineNum, '%l]
-    howMuch  = 'FILE => [$optKeyBlanks,:printedFileName, '%l]
-    howMuch  = 'ALL  => [$optKeyBlanks,:printedFileName, '%l,_
-                         $optKeyBlanks,:printedLineNum,  '%l]
+    howMuch  = 'ORG  => [$optKeyBlanks,:printedOrigin, '"%l"]
+    howMuch  = 'LINE => [$optKeyBlanks,:printedLineNum, '"%l"]
+    howMuch  = 'FILE => [$optKeyBlanks,:printedFileName, '"%l"]
+    howMuch  = 'ALL  => [$optKeyBlanks,:printedFileName, '"%l",_
+                         $optKeyBlanks,:printedLineNum,  '"%l"]
     '""
  
 showMsgPos? msg ==
@@ -429,7 +429,7 @@ getPreStL optPre ==
       (extraPlaces := ($preLength - (SIZE optPre) - 3)) > 0 =>
         MAKE_-FULL_-CVEC extraPlaces
       '""
-    ['%b, optPre,spses,'":", '%d]
+    ['"%b", optPre,spses,'":", '"%d"]
  
 -------------------
 --%   a-list stuff
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 26878aac..6e68ae3f 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -165,7 +165,7 @@ substituteSegmentedMsg(msg,args) ==
     n := STRINGLENGTH x
 
     -- x is a special case
-    (n > 2) and (c = "%") and (x.1 = "k") =>
+    (n > 2) and c = char "%" and x.1 = char "k" =>
         l := NCONC(nreverse pkey SUBSTRING(x,2,NIL),l)
 
     -- ?name gets replaced by '"Push PF10" or '"Type >b (enter)"
@@ -206,11 +206,9 @@ substituteSegmentedMsg(msg,args) ==
       --stifled after the first item in the list until the
       --end of the list. (using %n and %y)
       l :=
-         cons?(arg) =>
-           char 'y in q or (first arg = '"%y") or ((# arg) = 1)  =>
+         arg is [head,:tail] =>
+           char 'y in q or (head is '"%y") or (tail = nil)  =>
              append(reverse arg, l)
-           head := first arg
-           tail := rest arg
            ['"%y",:append(reverse tail, ['"%n",head,:l ]) ]
          [arg,:l]
       if char 'b in q then l := ['"%d",:l]
@@ -391,7 +389,7 @@ sayKeyedMsgFromDb(key,args,dbName) ==
   $msgDatabaseName : fluid := pathname dbName
   msg := segmentKeyedMsg getKeyedMsg key
   msg := substituteSegmentedMsg(msg,args)
-  if $displayMsgNumber then msg := ['"%b",key,":",'%d,:msg]
+  if $displayMsgNumber then msg := ['"%b",key,":",'"%d",:msg]
 --sayMSG flowSegmentedMsg(msg,$LINELENGTH,3)
   u := flowSegmentedMsg(msg,$LINELENGTH,3)
   sayBrightly u
@@ -448,11 +446,11 @@ flowSegmentedMsg(msg, len, offset) ==
     for f in msg repeat
       member(f,'("%l" %l)) =>
         actualMarg := potentialMarg
-        if lnl = 99999 then nl := ['%l,:nl]
+        if lnl = 99999 then nl := ['"%l",:nl]
         lnl := 99999
-      cons?(f) and member(first(f),'("%m" %m '%ce "%ce" %rj "%rj")) =>
+      cons?(f) and member(first(f),'("%m" %m %ce "%ce" %rj "%rj")) =>
         actualMarg := potentialMarg
-        nl := [f,'%l,:nl]
+        nl := [f,'"%l",:nl]
         lnl := 199999
       member(f,'("%i" %i )) =>
         potentialMarg := potentialMarg + 3
@@ -472,13 +470,13 @@ flowSegmentedMsg(msg, len, offset) ==
         lnl := lnl + sbl
       else
         member(f,'(%b %d _  "%b" "%d" " ")) =>
-          nl := [f,off1,'%l,:nl]
+          nl := [f,off1,'"%l",:nl]
           actualMarg := potentialMarg
           lnl := -1 + offset + sbl
-        nl := [f,off,'%l,:nl]
+        nl := [f,off,'"%l",:nl]
         lnl := offset + sbl
     concat nreverse nl
-  concat('%l,off,msg)
+  concat('"%l",off,msg)
 
 --% Other handy things
 
@@ -515,12 +513,12 @@ throwKeyedMsgCannotCoerceWithValue(val,t1,t2) ==
 --% Some Standard Message Printing Functions
 
 bright x == ['"%b",:(cons?(x) and null rest LASTNODE x => x; [x]),'"%d"]
---bright x == ['%b,:(atom x => [x]; x),'%d]
+--bright x == ['"%b",:(atom x => [x]; x),'"%d"]
 
 mkMessage msg ==
   msg and (cons? msg) and member((first msg),'(%l "%l"))  and
     member((last msg),'(%l "%l")) => concat msg
-  concat('%l,msg,'%l)
+  concat('"%l",msg,'"%l")
 
 sayMessage msg == sayMSG mkMessage msg
 
@@ -630,7 +628,7 @@ brightPrint0AsTeX(x, out == $OutputStream) ==
 blankIndicator x ==
   if IDENTP x then x := PNAME x
   not string? x or MAXINDEX x < 1 => nil
-  x.0 = '% and x.1 = 'x =>
+  x.0 = char '% and x.1 = char 'x =>
     MAXINDEX x > 1 => readInteger SUBSTRING(x,2,nil)
     1
   nil
@@ -643,58 +641,54 @@ brightPrint1(x, out == $OutputStream) ==
 
 brightPrintHighlight(x, out == $OutputStream) ==
   $texFormatting => brightPrintHighlightAsTeX(x,out)
-  IDENTP x =>
-    pn := PNAME x
-    sayString(pn,out)
+  x is [key,:rst] =>
+    if IDENTP key then key := PNAME key
+    key is '"%m" => mathprint(rst,out)
+    string? key and key in '("%p" "%s") => PRETTYPRIN0(rst,out)
+    key is '"%ce" => brightPrintCenter(rst,out)
+    key is '"%rj" => brightPrintRightJustify(rst,out)
+    key is '"%t"  => $MARG := $MARG + tabber rst
+    sayString('"(",out)
+    brightPrint1(key,out)
+    if key = 'TAGGEDreturn then
+      rst:=[first rst,second rst,third rst, '"environment (omitted)"]
+    for y in rst repeat
+      sayString('" ",out)
+      brightPrint1(y,out)
+    if rst and (la := LASTATOM rst) then
+      sayString('" . ",out)
+      brightPrint1(la,out)
+    sayString('")",out)
+  IDENTP x => sayString(PNAME x,out)
   -- following line helps find certain bugs that slip through
   -- also see sayBrightlyLength1
   vector? x => sayString('"UNPRINTABLE",out)
-  atom x => sayString(object2String x,out)
-  [key,:rst] := x
-  if IDENTP key then key:=PNAME key
-  key = '"%m" => mathprint(rst,out)
-  member(key,'("%p" "%s")) => PRETTYPRIN0(rst,out)
-  key = '"%ce" => brightPrintCenter(rst,out)
-  key = '"%rj" => brightPrintRightJustify(rst,out)
-  key = '"%t"  => $MARG := $MARG + tabber rst
-  sayString('"(",out)
-  brightPrint1(key,out)
-  if key = 'TAGGEDreturn then
-    rst:=[first rst,second rst,third rst, '"environment (omitted)"]
-  for y in rst repeat
-    sayString('" ",out)
-    brightPrint1(y,out)
-  if rst and (la := LASTATOM rst) then
-    sayString('" . ",out)
-    brightPrint1(la,out)
-  sayString('")",out)
+  sayString(object2String x,out)
 
 brightPrintHighlightAsTeX(x, out == $OutputStream) ==
-  IDENTP x =>
-    pn := PNAME x
-    sayString(pn,out)
-  atom x => sayString(object2String x,out)
+  x is [key,:rst] =>
+    key is '"%m" => mathprint(rst,out)
+    key is '"%s" => 
+      sayString('"\verb__",out)
+      PRETTYPRIN0(rst,out)
+      sayString('"__",out)
+    key is '"%ce" => brightPrintCenter(rst,out)
+    key is '"%t"  => $MARG := $MARG + tabber rst
+    -- unhandled junk (print verbatim(ish)
+    sayString('"(",out)
+    brightPrint1(key,out)
+    if key = 'TAGGEDreturn then
+      rst:=[first rst,second rst,third rst, '"environment (omitted)"]
+    for y in rst repeat
+      sayString('" ",out)
+      brightPrint1(y,out)
+    if rst and (la := LASTATOM rst) then
+      sayString('" . ",out)
+      brightPrint1(la,out)
+    sayString('")",out)
+  IDENTP x => sayString(PNAME x,out)
   vector? x => sayString('"UNPRINTABLE",out)
-  [key,:rst] := x
-  key = '"%m" => mathprint(rst,out)
-  key = '"%s" => 
-    sayString('"\verb__",out)
-    PRETTYPRIN0(rst,out)
-    sayString('"__",out)
-  key = '"%ce" => brightPrintCenter(rst,out)
-  key = '"%t"  => $MARG := $MARG + tabber rst
-  -- unhandled junk (print verbatim(ish)
-  sayString('"(",out)
-  brightPrint1(key,out)
-  if key = 'TAGGEDreturn then
-    rst:=[first rst,second rst,third rst, '"environment (omitted)"]
-  for y in rst repeat
-    sayString('" ",out)
-    brightPrint1(y,out)
-  if rst and (la := LASTATOM rst) then
-    sayString('" . ",out)
-    brightPrint1(la,out)
-  sayString('")",out)
+  sayString(object2String x,out)
 
 tabber num ==
     maxTab := 50
@@ -904,13 +898,13 @@ centerAndHighlight(text,:argList) ==
   width := IFCAR argList or $LINELENGTH
   fillchar := IFCAR IFCDR argList or '" "
   wid := entryWidth text + 2
-  wid >= width - 2 => sayBrightly ['%b,text,'%d]
+  wid >= width - 2 => sayBrightly ['"%b",text,'"%d"]
   f := DIVIDE(width - wid - 2,2)
   fill1 := '""
   for i in 1..(f.0) repeat
     fill1 := strconc(fillchar,fill1)
   if f.1 = 0 then fill2 := fill1 else fill2 := strconc(fillchar,fill1)
-  sayBrightly [fill1,'%b,text,'%d,fill2]
+  sayBrightly [fill1,'"%b",text,'"%d",fill2]
   nil
 
 centerNoHighlight(text,:argList) == sayBrightly center(text,argList)
@@ -947,7 +941,7 @@ splitListSayBrightly u ==
   for x in tails u repeat
     y := rest x
     null y => nil
-    first y = '%l =>
+    first y = '"%l" =>
       x.rest := nil
       ans:= [u,:rest y]
   ans
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index b8b80a04..d164fb93 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -72,7 +72,7 @@ displayPreCompilationErrors() ==
       heading:=
         $topOp ~= '$topOp => ['"   ",$topOp,'" has"]
         ['"   You have"]
-      sayBrightly [:heading,'%b,n,'%d,'"precompilation ",errors,'":"]
+      sayBrightly [:heading,'"%b",n,'"%d",'"precompilation ",errors,'":"]
   if 1<n then
     (for x in $postStack for i in 1.. repeat sayMath ['"   ",i,'"_) ",:x])
     else sayMath ['"    ",:first $postStack]
@@ -305,7 +305,7 @@ postForm u ==
     u:= postTranList u
     if u is [["%Comma",:.],:.] then
       postError ['"  ",:bright u,
-        '"is illegal because tuples cannot be applied_!",'%l,
+        '"is illegal because tuples cannot be applied_!",'"%l",
           '"   Did you misuse infix dot?"]
     u
   x is [.,["%Comma",:y]] => [first x,:y]
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index d53769a6..fe18b1b2 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -276,7 +276,7 @@ displaySetOptionInformation(arg,setData) ==
   -- otherwise we want to show the current setting
   centerAndHighlight (strconc('"The ",object2String arg,'" Option"),
                       $LINELENGTH,specialChar 'hbar)
-  sayBrightly ['%l,:bright '"Description:",setData.setLabel]
+  sayBrightly ['"%l",:bright '"Description:",setData.setLabel]
 
   st = 'FUNCTION =>
     TERPRI()
@@ -287,13 +287,13 @@ displaySetOptionInformation(arg,setData) ==
   st = 'INTEGER  =>
     sayMessage ['" The",:bright arg,'"option",
       '" may be followed by an integer in the range",
-       :bright setData.setLeaf.0,'"to",'%l,
+       :bright setData.setLeaf.0,'"to",'"%l",
         :bright setData.setLeaf.1,'"inclusive.",
          '" The current setting is",:bright eval setData.setVar]
 
   st = 'STRING  =>
     sayMessage ['" The",:bright arg,'"option",
-      '" is followed by a string enclosed in double quote marks.", '%l,
+      '" is followed by a string enclosed in double quote marks.", '"%l",
          '" The current setting is",:bright ["_"",eval setData.setVar, "_""]]
 
   st = 'LITERALS =>
@@ -335,7 +335,7 @@ displaySetVariableSettings(setTree,label) ==
         functionp(setData.setVar) => FUNCALL( setData.setVar,"%display%")
         '"unimplemented"
       if cons? opt then opt := [:[o,'" "] for o in opt]
-      sayBrightly concat(setOption,'%b,opt,'%d)
+      sayBrightly concat(setOption,'"%b",opt,'"%d")
     st = 'STRING   =>
       opt := object2String eval setData.setVar
       sayBrightly [setOption,:bright opt]
@@ -354,7 +354,7 @@ displaySetVariableSettings(setTree,label) ==
     sayBrightly ['"Variables with current values of",:bright '"...",
       '"have further sub-options. For example,"]
     sayBrightly ['"issue",:bright '")set ",subname,
-      '" to see what the options are for",:bright subname,'".",'%l,
+      '" to see what the options are for",:bright subname,'".",'"%l",
         '"For more information, issue",:bright '")help set",'"."]
 
 
@@ -384,11 +384,11 @@ setAsharpArgs arg ==
 
 describeAsharpArgs() ==
   sayBrightly LIST (
-   '%b,'")set compiler args ",'%d,_
-   '"is used to tell AXIOM how to invoke the library compiler ",'%l,_
-   '" when compiling code for AXIOM.",'%l,_
-   '" The args option is followed by a string enclosed in double quotes.",'%l,'%l,_
-   '" The current setting is",'%l,'%b,'"_"",$asharpCmdlineFlags,'"_"",'%d)
+   '"%b",'")set compiler args ",'"%d",_
+   '"is used to tell AXIOM how to invoke the library compiler ",'"%l",_
+   '" when compiling code for AXIOM.",'"%l",_
+   '" The args option is followed by a string enclosed in double quotes.",'"%l",'"%l",_
+   '" The current setting is",'"%l",'"%b",'"_"",$asharpCmdlineFlags,'"_"",'"%d")
 
 
 setInputLibrary arg ==
@@ -422,20 +422,20 @@ setOutputLibrary arg ==
 
 describeOutputLibraryArgs() ==
   sayBrightly LIST (
-   '%b,'")set compiler output library",'%d,_
-   '"is used to tell the compiler where to place", '%l,_
-   '"compiled code generated by the library compiler.  By default it goes",'%l,_
-   '"in a file called",'%b, '"user.lib", '%d, '"in the current directory." 
+   '"%b",'")set compiler output library",'"%d",_
+   '"is used to tell the compiler where to place", '"%l",_
+   '"compiled code generated by the library compiler.  By default it goes",'"%l",_
+   '"in a file called",'"%b", '"user.lib", '"%d", '"in the current directory." 
     )
 
 
 describeInputLibraryArgs() ==
   sayBrightly LIST (
-   '%b,'")set compiler input add library",'%d,_
-   '"is used to tell AXIOM to add", '%b, '"library", '%d, '"to",'%l,
+   '"%b",'")set compiler input add library",'"%d",_
+   '"is used to tell AXIOM to add", '"%b", '"library", '"%d", '"to",'"%l",
    '"the front of the path which determines where compiled code is loaded from.",_
-   '%l, '%b,'")set compiler input drop library",'%d,_
-   '"is used to tell AXIOM to remove", '%b, '"library", '%d, '%l,_
+   '"%l", '"%b",'")set compiler input drop library",'"%d",_
+   '"is used to tell AXIOM to remove", '"%b", '"library", '"%d", '%l,_
    '"from this path."
     )
 
@@ -658,7 +658,7 @@ setFortTmpDir arg ==
   -- VM code - must be an accessed disk mode [mode]
   not (mode := validateOutputDirectory arg) =>
     sayBrightly ['" Sorry, but your argument(s)",:bright arg,
-      '"is(are) not valid.",'%l]
+      '"is(are) not valid.",'"%l"]
     describeSetFortTmpDir()
   $fortranTmpDir := mode
 
@@ -671,14 +671,14 @@ validateOutputDirectory x ==
 
 describeSetFortTmpDir() ==
   sayBrightly [
-   '%b,'")set fortran calling tempfile",'%d,_
-   '" is used to tell AXIOM where",'%l,_
-   '" to place intermediate FORTRAN data files . This must be the ",'%l,_
-   '" name of a valid existing directory to which you have permission ",'%l,_
-   '" to write (including the final slash).",'%l,'%l,_
-   '" Syntax:",'%l,_
-   '"   )set fortran calling tempfile DIRECTORYNAME",'%l,'%l,_
-   '" The current setting is",'%b,$fortranTmpDir,'%d]
+   '"%b",'")set fortran calling tempfile",'"%d",_
+   '" is used to tell AXIOM where",'"%l",_
+   '" to place intermediate FORTRAN data files . This must be the ",'"%l",_
+   '" name of a valid existing directory to which you have permission ",'"%l",_
+   '" to write (including the final slash).",'"%l",'"%l",_
+   '" Syntax:",'"%l",_
+   '"   )set fortran calling tempfile DIRECTORYNAME",'"%l",'"%l",_
+   '" The current setting is",'"%b",$fortranTmpDir,'"%d"]
 
 
 setFortDir arg ==
@@ -697,21 +697,21 @@ setFortDir arg ==
   -- VM code - must be an accessed disk mode [mode]
   not (mode := validateOutputDirectory arg) =>
     sayBrightly ['" Sorry, but your argument(s)",:bright arg,
-      '"is(are) not valid.",'%l]
+      '"is(are) not valid.",'"%l"]
     describeSetFortDir()
   $fortranDirectory := mode
 
 
 describeSetFortDir() ==
   sayBrightly LIST (
-   '%b,'")set fortran calling directory",'%d,_
-   '" is used to tell AXIOM where",'%l,_
-   '" to place generated FORTRAN files. This must be the name ",'%l,_
-   '" of a valid existing directory to which you have permission ",'%l,_
-   '" to write (including the final slash).",'%l,'%l,_
-   '" Syntax:",'%l,_
-   '"   )set fortran calling directory DIRECTORYNAME",'%l,'%l,_
-   '" The current setting is",'%b,$fortranDirectory,'%d)
+   '"%b",'")set fortran calling directory",'"%d",_
+   '" is used to tell OpenAxiom where",'"%l",_
+   '" to place generated FORTRAN files. This must be the name ",'"%l",_
+   '" of a valid existing directory to which you have permission ",'"%l",_
+   '" to write (including the final slash).",'"%l",'"%l",_
+   '" Syntax:",'"%l",_
+   '"   )set fortran calling directory DIRECTORYNAME",'"%l",'"%l",_
+   '" The current setting is",'"%b",$fortranDirectory,'"%d")
 
 
 setLinkerArgs arg ==
@@ -728,16 +728,16 @@ setLinkerArgs arg ==
 
 describeSetLinkerArgs() ==
   sayBrightly [
-   '%b,'")set fortran calling linkerargs",'%d,_
-   '" is used to pass arguments to the linker",'%l,_
-   '" when using ",'%b,'"mkFort",'%d,_
-   '" to create functions which call Fortran code.",'%l,_
-   '" For example, it might give a list of libraries to be searched,",'%l,_
-   '" and their locations.",'%l,_
-   '" The string is passed verbatim, so must be the correct syntax for",'%l,_
-   '" the particular linker being used.",'%l,'%l,_
-   '" Example: )set fortran calling linker _"-lxlf_"",'%l,'%l,_
-   '" The current setting is",'%b,$fortranLibraries,'%d]
+   '"%b",'")set fortran calling linkerargs",'"%d",_
+   '" is used to pass arguments to the linker",'"%l",_
+   '" when using ",'"%b",'"mkFort",'"%d",_
+   '" to create functions which call Fortran code.",'"%l",_
+   '" For example, it might give a list of libraries to be searched,",'"%l",_
+   '" and their locations.",'"%l",_
+   '" The string is passed verbatim, so must be the correct syntax for",'"%l",_
+   '" the particular linker being used.",'"%l",'"%l",_
+   '" Example: )set fortran calling linker _"-lxlf_"",'"%l",'"%l",_
+   '" The current setting is",'"%b",$fortranLibraries,'"%d"]
 
 -- See the section functions in setvart.boot
 --
@@ -786,14 +786,14 @@ countCache n ==
 
 describeSetFunctionsCache() ==
   sayBrightly [
-    '%b,'")set functions cache",'%d,'"is used to tell AXIOM how many",'%l,_
-    '" values computed by interpreter functions should be saved.  This can save ",'%l, _
-    '" quite a bit of time in recursive functions, though one must consider that",'%l,_
-    '" the cached values will take up (perhaps valuable) room in the workspace.",'%l,'%l,_
-    '" The value given  after",'%b,'"cache",'%d,'"must either be the",_
-    '" word",'%b,'"all",'%d,'"or a positive",'%l,_
-    '" integer.  This may be followed by any number of function names whose cache",'%l,_
-    '" sizes you wish to so set.  If no functions are given, the default cache",'%l,_
+    '"%b",'")set functions cache",'"%d",'"is used to tell AXIOM how many",'"%l",_
+    '" values computed by interpreter functions should be saved.  This can save ",'"%l", _
+    '" quite a bit of time in recursive functions, though one must consider that",'"%l",_
+    '" the cached values will take up (perhaps valuable) room in the workspace.",'"%l",'"%l",_
+    '" The value given  after",'"%b",'"cache",'"%d",'"must either be the",_
+    '" word",'"%b",'"all",'"%d",'"or a positive",'"%l",_
+    '" integer.  This may be followed by any number of function names whose cache",'"%l",_
+    '" sizes you wish to so set.  If no functions are given, the default cache",'"%l",_
     '" size is set.",'%l,'" Examples:",_
     '"   )set fun cache all         )set fun cache 10 f g Legendre"]
 
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index 8335b4b9..67ffca86 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -666,11 +666,11 @@ getOption(opt,l) ==
 
 reportSpadTrace(header,[op,sig,n,:t]) ==
   null $traceNoisely => nil
-  msg:= [header,'%b,op,":",'%d,rest sig," -> ",first sig," in slot ",n]
+  msg:= [header,'"%b",op,":",'"%d",rest sig," -> ",first sig," in slot ",n]
   namePart:= nil --(t is (.,.,name,:.) => (" named ",name); NIL)
   tracePart:=
     t is [y,:.] and not null y =>
-      (y="all" => ['%b,"all",'%d,"vars"]; [" vars: ",y])
+      (y="all" => ['"%b","all",'"%d","vars"]; [" vars: ",y])
     NIL
   sayBrightly [:msg,:namePart,:tracePart]
 
@@ -776,7 +776,7 @@ _?t() ==
     suffix:=
       isDomain d => '"domain"
       '"package"
-    sayBrightly ['"   Functions traced in ",suffix,'%b,devaluate d,'%d,":"]
+    sayBrightly ['"   Functions traced in ",suffix,'"%b",devaluate d,'"%d",":"]
     for x in orderBySlotNumber l repeat reportSpadTrace("   ",take(4,x))
     TERPRI()
 
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index e3c82844..d6e3b5c0 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -506,8 +506,8 @@ compMacro(form,m,e) ==
       rhs is ['CAPSULE,:.]  => ['"-- the constructor capsule"]
       rhs is ['add,:.]      => ['"-- the constructor capsule"]
       formatUnabbreviated rhs
-    sayBrightly ['"   processing macro definition",'%b,
-      :formatUnabbreviated lhs,'" ==> ",:rhs,'%d]
+    sayBrightly ['"   processing macro definition",'"%b",
+      :formatUnabbreviated lhs,'" ==> ",:rhs,'"%d"]
   ["MDEF",lhs,signature,specialCases,rhs]:= form:= macroExpand(form,e)
   m=$EmptyMode or m=$NoValueMode =>
     ["/throwAway",$NoValueMode,putMacro(lhs.op,rhs,e)]
@@ -521,8 +521,8 @@ compMacro(form,m,e) ==
 --    rhs is ['CAPSULE,:.]  => ['"-- the constructor capsule"]
 --    rhs is ['add,:.]      => ['"-- the constructor capsule"]
 --    formatUnabbreviated rhs
---  sayBrightly ['"   processing macro definition",'%b,
---    :formatUnabbreviated lhs,'" ==> ",:rhs,'%d]
+--  sayBrightly ['"   processing macro definition",'"%b",
+--    :formatUnabbreviated lhs,'" ==> ",:rhs,'"%d"]
 --  ["MDEF",lhs,signature,specialCases,rhs]:= form:= macroExpand(form,e)
 --  m=$EmptyMode or m=$NoValueMode =>
 --    rhs := markMacro(lhs,rhs)
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index 9280c4c0..eb0e2370 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -588,12 +588,12 @@ compMapCond''(cexpr,dc) ==
   cexpr is ["has",name,cat] => (knownInfo cexpr => true; false)
         --for the time being we'll stop here - shouldn't happen so far
         --$disregardConditionIfTrue => true
-        --stackSemanticError(("not known that",'%b,name,
-        -- '%d,"has",'%b,cat,'%d),nil)
+        --stackSemanticError(("not known that",'"%b",name,
+        -- '"%d","has",'"%b",cat,'"%d"),nil)
   --now it must be an attribute
   member(["ATTRIBUTE",dc,cexpr],get("$Information","special",$e)) => true
   --for the time being we'll stop here - shouldn't happen so far
-  stackMessage ["not known that",'%b,dc,'%d,"has",'%b,cexpr,'%d]
+  stackMessage ["not known that",'"%b",dc,'"%d","has",'"%b",cexpr,'"%d"]
   false
  
 --======================================================================