diff --git a/Makefile.in b/Makefile.in
index 383793be6f894..d6ede37c4aa7c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -368,7 +368,7 @@ endif
 
 STAGE$(1)_T_$(2)_H_$(3) := 						\
 	$$(Q)$$(call CFG_RUN_TARG,$(1),				\
-		$$(CFG_VALGRIND_COMPILE$(1)) 			\
+## 		$$(CFG_VALGRIND_COMPILE$(1)) 			\
 		$$(HBIN$(1)_H_$(3))/rustc$$(X)			\
 		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3))			\
 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2))
diff --git a/configure b/configure
index e67ea3af5f382..e1f4d2102a15d 100755
--- a/configure
+++ b/configure
@@ -283,7 +283,7 @@ else
 fi
 
 opt sharedstd 1 "build libstd as a shared library"
-opt valgrind 1 "run tests with valgrind (memcheck by default)"
+opt valgrind 0 "run tests with valgrind (memcheck by default)"
 opt helgrind 0 "run tests with helgrind instead of memcheck"
 opt docs     1 "build documentation"
 opt optimize 1 "build optimized rust code"
diff --git a/src/libcore/core.rs b/src/libcore/core.rs
index 5ef11a4ad4648..35131e561d953 100644
--- a/src/libcore/core.rs
+++ b/src/libcore/core.rs
@@ -12,7 +12,7 @@ pub use WindowsPath = path::WindowsPath;
 pub use PosixPath = path::PosixPath;
 
 pub use tuple::{CopyableTuple, ImmutableTuple, ExtendedTupleOps};
-pub use str::{StrSlice, UniqueStr};
+pub use str::{StrSlice, Trimmable};
 pub use vec::{ConstVector, CopyableVector, ImmutableVector};
 pub use vec::{ImmutableEqVector, ImmutableCopyableVector};
 pub use vec::{MutableVector, MutableCopyableVector};
diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index 447cb59acf80e..d8fabb1c9e019 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -2029,14 +2029,14 @@ pub mod raw {
 
 }
 
-pub trait UniqueStr {
+pub trait Trimmable {
     pure fn trim() -> self;
     pure fn trim_left() -> self;
     pure fn trim_right() -> self;
 }
 
 /// Extension methods for strings
-impl ~str: UniqueStr {
+impl ~str: Trimmable {
     /// Returns a string with leading and trailing whitespace removed
     #[inline]
     pure fn trim() -> ~str { trim(self) }