diff --git a/src/svalue.h b/src/svalue.h
index 8027718205464f2a0bcc64597d9341e218bd4f17..35f2aed8b0c613b1866802cdfbee855d5a6fc834 100644
--- a/src/svalue.h
+++ b/src/svalue.h
@@ -314,10 +314,10 @@ struct svalue
 #define tStr "\006"
 #define tString "\006"
 #define tNStr(T) "\357" T
-#define tStr0 "\357" tZero
-#define tStr7 "\357" "\010\000\000\000\000\000\000\000\177"
-#define tStr8 "\357" "\010\000\000\000\000\000\000\000\377"
-#define tStr16 "\357" "\010\000\000\000\000\000\000\377\377"
+#define tStr0 tNStr(tZero)
+#define tStr7 tNStr(tInt7bit)
+#define tStr8 tNStr(tInt8bit)
+#define tStr16 tNStr(tInt16bit)
 #define tStr32 "\006"
 #define tType(T) "\007" T
 #define tInt "\022"
@@ -333,6 +333,9 @@ struct svalue
 #define tInt07 "\010\000\000\000\000\000\000\000\007"
 #define tInt08 "\010\000\000\000\000\000\000\000\010"
 #define tInt09 "\010\000\000\000\000\000\000\000\011"
+#define tInt7bit "\010\000\000\000\000\000\000\000\177"
+#define tInt8bit "\010\000\000\000\000\000\000\000\377"
+#define tInt16bit "\010\000\000\000\000\000\000\377\377"
 #define tIntPos "\010\000\000\000\000\177\377\377\377"
 #define tInt1Plus "\010\000\000\000\001\177\377\377\377"
 #define tInt2Plus "\010\000\000\000\002\177\377\377\377"