 +	      | IULong -> "IULong"
 +	      | ILongLong -> "ILongLong"
 +	      | IULongLong -> "IULongLong"
-+    in  pQuoted ("Ikind" ^ tok)
++    in text ("Ikind_" ^ tok)
 +
 +  method private pp_fkind (fkin:fkind) : doc =
 +    let tok = match fkin with
 +	      | FFloat -> "FFloat"
 +	      | FDouble -> "FDouble"
 +	      | FLongDouble -> "FLongDouble"
-+    in pQuoted ("Fkind" ^ tok)
++    in text ("Fkind_" ^ tok)
 +
 +  method private pp_typsig (tsig:typsig) : doc = if !E.verboseFlag then trace "pp_typsig" ;
 +    match tsig with

+  method dInit (out:out_channel) (i:int) (init1:init) : unit = fprint out i (self#pInit () init1)
+
+  (*** auxiliary methods ***)
+  (* Mart: hmmmm *)
+  method private pp_storage (s:storage) : doc =
+    let tok = match s with
+	      | NoStorage -> "NoStorage"
+	      | Static    -> "Static"
+	      | Register  -> "Register"
+	      | Extern	  -> "Extern"
+    in pQuoted ("Storage" ^ tok)
+
+  method private pp_typeinfo (tinfo:typeinfo) : doc = if !E.verboseFlag then trace "pp_typeinfo" ;
+    text "Typeinfo" ++ (pParens @ pCommaSep) [   

+	      | BOr -> "BOr"
+	      | LAnd -> "LAnd"
+	      | LOr -> "LOr"
+    in text ("BinOp_" ^ tok )
+
+  method private pp_constant (c:constant) : doc = if !E.verboseFlag then trace "pp_constant" ;
+    match c with
