diff --git a/src/builder.rs b/src/builder.rs
index 70a93cb06d13..f30362871528 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -1365,7 +1365,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
     ) -> RValue<'gcc> {
         // FIXME(antoyo): remove when having a proper API.
         let gcc_func = unsafe { std::mem::transmute(func) };
-        let call = if self.functions.borrow().values().find(|value| **value == gcc_func).is_some() {
+        let call = if self.functions.borrow().values().any(|value| *value == gcc_func) {
             self.function_call(func, args, funclet)
         }
         else {
diff --git a/src/context.rs b/src/context.rs
index 6391c4e9d836..9bd3710ac8ad 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -258,8 +258,8 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
 
     pub fn rvalue_as_function(&self, value: RValue<'gcc>) -> Function<'gcc> {
         let function: Function<'gcc> = unsafe { std::mem::transmute(value) };
-        debug_assert!(self.functions.borrow().values().find(|value| **value == function).is_some(),
-            "{:?} is not a function", function);
+        debug_assert!(self.functions.borrow().values().any(|value| *value == function),
+            "{:?} ({:?}) is not a function", value, value.get_type());
         function
     }