diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index 757c799d85cb9..35732dacd44f9 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -62,9 +62,9 @@ use core::ops::{Deref, DerefMut};
 use core::ptr::{Unique};
 use core::raw::{TraitObject};
 
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 use core::marker::Unsize;
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 use core::ops::CoerceUnsized;
 
 /// A value that represents the heap. This is the default place that the `box`
@@ -396,5 +396,5 @@ impl<'a,A,R> FnOnce<A> for Box<FnBox<A,Output=R>+Send+'a> {
     }
 }
 
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<Box<U>> for Box<T> {}
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index 15d6e6fa9606c..f2b83fdeefa3a 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -228,7 +228,7 @@ impl<T> !marker::Sync for Rc<T> {}
 #[cfg(not(stage0))]
 impl<T: ?Sized> !marker::Sync for Rc<T> {}
 
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<Rc<U>> for Rc<T> {}
 
 impl<T> Rc<T> {
@@ -459,7 +459,7 @@ impl<T: ?Sized> Deref for Rc<T> {
     }
 }
 
-#[cfg(stage0)] // SNAP c64d671
+#[cfg(stage0)]
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T> Drop for Rc<T> {
     /// Drops the `Rc<T>`.
@@ -510,7 +510,7 @@ impl<T> Drop for Rc<T> {
     }
 }
 
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T: ?Sized> Drop for Rc<T> {
     /// Drops the `Rc<T>`.
@@ -930,7 +930,7 @@ impl<T: ?Sized> Weak<T> {
     }
 }
 
-#[cfg(stage0)] // SNAP c64d671
+#[cfg(stage0)]
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T> Drop for Weak<T> {
     /// Drops the `Weak<T>`.
@@ -975,7 +975,7 @@ impl<T> Drop for Weak<T> {
     }
 }
 
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T: ?Sized> Drop for Weak<T> {
     /// Drops the `Weak<T>`.
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index 968f68a78a7e4..5909c5cc30e51 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -55,7 +55,7 @@ pub trait Sized {
 
 /// Types that can be "unsized" to a dynamically sized type.
 #[unstable(feature = "core")]
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 #[lang="unsize"]
 pub trait Unsize<T> {
     // Empty.
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
index bb94cd886d74d..173b73fdb0924 100644
--- a/src/libcore/mem.rs
+++ b/src/libcore/mem.rs
@@ -95,7 +95,7 @@ pub fn size_of<T>() -> usize {
 ///
 /// assert_eq!(4, mem::size_of_val(&5i32));
 /// ```
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 #[inline]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn size_of_val<T: ?Sized>(val: &T) -> usize {
@@ -111,7 +111,7 @@ pub fn size_of_val<T: ?Sized>(val: &T) -> usize {
 ///
 /// assert_eq!(4, mem::size_of_val(&5i32));
 /// ```
-#[cfg(stage0)] // SNAP c64d671
+#[cfg(stage0)]
 #[inline]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn size_of_val<T>(_val: &T) -> usize {
@@ -144,7 +144,7 @@ pub fn min_align_of<T>() -> usize {
 ///
 /// assert_eq!(4, mem::min_align_of_val(&5i32));
 /// ```
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 #[inline]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {
@@ -160,7 +160,7 @@ pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {
 ///
 /// assert_eq!(4, mem::min_align_of_val(&5i32));
 /// ```
-#[cfg(stage0)] // SNAP c64d671
+#[cfg(stage0)]
 #[inline]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn min_align_of_val<T>(_val: &T) -> usize {
diff --git a/src/libcore/nonzero.rs b/src/libcore/nonzero.rs
index 85957382826a1..59819fd500d1d 100644
--- a/src/libcore/nonzero.rs
+++ b/src/libcore/nonzero.rs
@@ -12,7 +12,7 @@
 
 use marker::Sized;
 use ops::Deref;
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 use ops::CoerceUnsized;
 
 /// Unsafe trait to indicate what types are usable with the NonZero struct
@@ -57,5 +57,5 @@ impl<T: Zeroable> Deref for NonZero<T> {
     }
 }
 
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<T: Zeroable+CoerceUnsized<U>, U: Zeroable> CoerceUnsized<NonZero<U>> for NonZero<T> {}
diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs
index 9396adc0fe5b7..f16614cfd092d 100644
--- a/src/libcore/ops.rs
+++ b/src/libcore/ops.rs
@@ -70,7 +70,7 @@
 use marker::Sized;
 use fmt;
 
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 use marker::Unsize;
 
 /// The `Drop` trait is used to run some code when a value goes out of scope. This
@@ -1214,39 +1214,39 @@ mod impls {
 /// Trait that indicates that this is a pointer or a wrapper for one,
 /// where unsizing can be performed on the pointee.
 #[unstable(feature = "core")]
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 #[lang="coerce_unsized"]
 pub trait CoerceUnsized<T> {
     // Empty.
 }
 
 // &mut T -> &mut U
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<&'a mut U> for &'a mut T {}
 // &mut T -> &U
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<'a, 'b: 'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b mut T {}
 // &mut T -> *mut U
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for &'a mut T {}
 // &mut T -> *const U
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for &'a mut T {}
 
 // &T -> &U
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<'a, 'b: 'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
 // &T -> *const U
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for &'a T {}
 
 // *mut T -> *mut U
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
 // *mut T -> *const U
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for *mut T {}
 
 // *const T -> *const U
-#[cfg(not(stage0))] // SNAP c64d671
+#[cfg(not(stage0))]
 impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for *const T {}
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index e92779641c9cb..8375061aa095b 100644
--- a/src/librustc_typeck/diagnostics.rs
+++ b/src/librustc_typeck/diagnostics.rs
@@ -309,7 +309,6 @@ register_diagnostics! {
     E0034, // multiple applicable methods in scope
     E0035, // does not take type parameters
     E0036, // incorrect number of type parameters given for this method
-    E0038, // cannot convert to a trait object because trait is not object-safe
     E0040, // explicit use of destructor method
     E0044, // foreign items may not have type parameters
     E0045, // variadic function must have C calling convention