@@ -25,11 +25,11 @@
     var = objv[idx];				\
     OPT_POSTLOG()
 
 #define OPTSTR(option, var)			\
     OPT_PROLOG(option)				\
-    var = Tcl_GetStringFromObj(objv[idx], (Tcl_Size *)NULL);\
+    var = Tcl_GetString(objv[idx]);\
     OPT_POSTLOG()
 
 #define OPTINT(option, var)			\
     OPT_PROLOG(option)				\
     if (Tcl_GetIntFromObj(interp, objv[idx],	\
@@ -44,11 +44,11 @@
 	    &(var)) != TCL_OK) {		\
 	    return TCL_ERROR;			\
     }						\
     OPT_POSTLOG()
 
-#define OPTBYTE(option, var, lvar)			\
+#define OPTBYTE(option, var, lvar)		\
     OPT_PROLOG(option)				\
     var = Tcl_GetByteArrayFromObj(objv[idx], &(lvar));\
     OPT_POSTLOG()
 
 #define OPTBAD(type, list)			\