diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index 63fbbb8ea4a..5ce49275532 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_10_7_BETA2
+NSPR_4_10_7_BETA3
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index 6c66b37ca0f..e49e92677e3 100644
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/nsprpub/configure b/nsprpub/configure
index 5579834d798..bb4c28fbae2 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -7099,8 +7099,6 @@ tools are selected during the Xcode/Developer Tools installation." "$LINENO" 5
         # Use temp file for windres (bug 213281)
         RCFLAGS='-O coff --use-temp-file'
     else
-        CC=cl
-        CXX=cl
         LD=link
         AR='lib -NOLOGO -OUT:"$@"'
         AR_FLAGS=
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 24c738b2568..067799029c9 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1915,8 +1915,6 @@ tools are selected during the Xcode/Developer Tools installation.])
         # Use temp file for windres (bug 213281)
         RCFLAGS='-O coff --use-temp-file'
     else
-        CC=cl
-        CXX=cl
         LD=link
         AR='lib -NOLOGO -OUT:"$@"'
         AR_FLAGS=
diff --git a/nsprpub/pr/src/threads/prtpd.c b/nsprpub/pr/src/threads/prtpd.c
index decbc1ccad3..0eb2a011c62 100644
--- a/nsprpub/pr/src/threads/prtpd.c
+++ b/nsprpub/pr/src/threads/prtpd.c
@@ -130,8 +130,9 @@ PR_IMPLEMENT(PRStatus) PR_NewThreadPrivateIndex(
 ** destructor function and a non-NULL per-thread-private data value,
 ** the destructor function is invoked.
 **
-** This can return PR_FAILURE if index is invalid (ie., beyond the current
-** high water mark) or memory is insufficient to allocate an exanded vector.
+** This can return PR_FAILURE if index is invalid (ie., beyond the limit
+** on the TPD slots) or memory is insufficient to allocate an expanded
+** vector.
 */
 
 PR_IMPLEMENT(PRStatus) PR_SetThreadPrivate(PRUintn index, void *priv)
@@ -139,11 +140,10 @@ PR_IMPLEMENT(PRStatus) PR_SetThreadPrivate(PRUintn index, void *priv)
     PRThread *self = PR_GetCurrentThread();
 
     /*
-    ** The index being set might not have a sufficient vector in this
-    ** thread. But if the index has been allocated, it's okay to go
-    ** ahead and extend this one now.
+    ** To improve performance, we don't check if the index has been
+    ** allocated.
     */
-    if ((index >= _PR_TPD_LIMIT) || (index >= _pr_tpd_highwater))
+    if (index >= _PR_TPD_LIMIT)
     {
         PR_SetError(PR_TPD_RANGE_ERROR, 0);
         return PR_FAILURE;
@@ -152,6 +152,10 @@ PR_IMPLEMENT(PRStatus) PR_SetThreadPrivate(PRUintn index, void *priv)
     PR_ASSERT(((NULL == self->privateData) && (0 == self->tpdLength))
         || ((NULL != self->privateData) && (0 != self->tpdLength)));
 
+    /*
+    ** If this thread does not have a sufficient vector for the index
+    ** being set, go ahead and extend this vector now.
+    */
     if ((NULL == self->privateData) || (self->tpdLength <= index))
     {
         void *extension = PR_CALLOC(_pr_tpd_length * sizeof(void*));