@@ -819,11 +819,11 @@
 	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
 	return TCL_ERROR;
     }
 
     /* Get channel */
-    chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], (Tcl_Size *) NULL), &mode);
+    chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), &mode);
     if (chan == (Tcl_Channel) NULL) {
 	return TCL_ERROR;
     }
 
     /* Make sure to operate on the topmost channel */
@@ -830,11 +830,11 @@
     chan = Tcl_GetTopChannel(chan);
 
     /* Check if encryption channel */
     if (Tcl_GetChannelType(chan) != &encryptChannelType) {
 	Tcl_AppendResult(interp, "bad channel \"", Tcl_GetChannelName(chan),
-	    "\": not a encryption channel", NULL);
+	    "\": not a encryption channel", (char *) NULL);
 	Tcl_SetErrorCode(interp, "TLS", "UNSTACK", "CHANNEL", "INVALID", (char *) NULL);
 	return TCL_ERROR;
     }
 
     /* Pop transform from channel */
@@ -964,11 +964,11 @@
  *-------------------------------------------------------------------
  */
 int EncryptCommandHandler(Tcl_Interp *interp, int type, Tcl_Obj *cmdObj,
 	Tcl_Obj *cipherObj, Tcl_Obj *digestObj, Tcl_Obj *keyObj, Tcl_Obj *ivObj) {
     EncryptState *statePtr;
-    char *cmdName = Tcl_GetStringFromObj(cmdObj, (Tcl_Size *) NULL);
+    char *cmdName = Tcl_GetString(cmdObj);
 
     dprintf("Called");
 
     if ((statePtr = EncryptStateNew(interp, type)) == NULL) {
 	Tcl_AppendResult(interp, "Memory allocation error", (char *) NULL);
@@ -1202,11 +1202,11 @@
 	Tcl_WrongNumArgs(interp, 1, objv, "?-cipher? name ?-digest name? -key key ?-iv string? ?-mac name? [-channel chan | -command cmdName | -infile filename -outfile filename | ?-data? data]");
 	return TCL_ERROR;
     }
 
     /* Special case of first arg is cipher */
-    opt = Tcl_GetStringFromObj(objv[start], (Tcl_Size *) NULL);
+    opt = Tcl_GetString(objv[start]);
     if (opt[0] != '-') {
 	switch(type) {
 	case TYPE_ENCRYPT:
 	case TYPE_DECRYPT:
 	    cipherObj = objv[start++];
@@ -1216,11 +1216,11 @@
 
     /* Get options */
     for (int idx = start; idx < objc; idx++) {
 	/* Special case for when last arg is data */
 	if (idx == objc - 1) {
-	opt = Tcl_GetStringFromObj(objv[idx], (Tcl_Size *) NULL);
+	opt = Tcl_GetString(objv[idx]);
 	    if (opt[0] != '-' && dataObj == NULL) {
 		dataObj = objv[idx];
 		break;
 	    }
 	}