@@ -367,11 +367,11 @@
     dprintf("Called");
 
     if (msg && *msg) {
 	Tcl_SetErrorCode(statePtr->interp, "SSL", msg, (char *)NULL);
     } else {
-	msg = Tcl_GetStringFromObj(Tcl_GetObjResult(statePtr->interp), NULL);
+	msg = Tcl_GetString(Tcl_GetObjResult(statePtr->interp));
     }
     statePtr->err = msg;
 
     if (statePtr->callback == (Tcl_Obj*)NULL) {
 	char buf[BUFSIZ];
@@ -649,11 +649,11 @@
 	if (objc != 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "channel");
 		return(TCL_ERROR);
 	}
 
-	chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL);
+	chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL);
 	if (chan == (Tcl_Channel) NULL) {
 		return(TCL_ERROR);
 	}
 
 	/*
@@ -780,11 +780,11 @@
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "channel ?options?");
 	return TCL_ERROR;
     }
 
-    chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL);
+    chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL);
     if (chan == (Tcl_Channel) NULL) {
 	return TCL_ERROR;
     }
 
     /*
@@ -791,11 +791,11 @@
      * Make sure to operate on the topmost channel
      */
     chan = Tcl_GetTopChannel(chan);
 
     for (idx = 2; idx < objc; idx++) {
-	char *opt = Tcl_GetStringFromObj(objv[idx], NULL);
+	char *opt = Tcl_GetString(objv[idx]);
 
 	if (opt[0] != '-')
 	    break;
 
 	OPTSTR( "-cadir", CAdir);
@@ -1414,16 +1414,16 @@
 
     dprintf("Called");
 
     switch (objc) {
 	case 2:
-	    channelName = Tcl_GetStringFromObj(objv[1], NULL);
+	    channelName = Tcl_GetString(objv[1]);
 	    break;
 
 	case 3:
 	    if (!strcmp (Tcl_GetString (objv[1]), "-local")) {
-		channelName = Tcl_GetStringFromObj(objv[2], NULL);
+		channelName = Tcl_GetString(objv[2]);
 		break;
 	    }
 	    /* else fall... */
 	default:
 	    Tcl_WrongNumArgs(interp, 1, objv, "?-local? channel");