diff --git a/src/librustc_trans/back/write.rs b/src/librustc_trans/back/write.rs
index 28804e4ed9e..071960f1944 100644
--- a/src/librustc_trans/back/write.rs
+++ b/src/librustc_trans/back/write.rs
@@ -812,12 +812,10 @@ pub fn run_passes(sess: &Session,
                 copy_if_one_unit(OutputType::LlvmAssembly, false);
             }
             OutputType::Assembly => {
-                // TODO: These are probably wrong
                 copy_if_one_unit(OutputType::Assembly, false);
             }
             OutputType::Object => {
                 user_wants_objects = true;
-                // TODO: These are probably wrong
                 copy_if_one_unit(OutputType::Object, true);
             }
             OutputType::Exe |
diff --git a/src/librustc_trans/collector.rs b/src/librustc_trans/collector.rs
index aff50e5e1f4..048e95f31b4 100644
--- a/src/librustc_trans/collector.rs
+++ b/src/librustc_trans/collector.rs
@@ -456,8 +456,11 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> {
         match *rvalue {
             mir::Rvalue::Aggregate(mir::AggregateKind::Closure(def_id,
                                                                ref substs), _) => {
-                let mir = errors::expect(self.scx.sess().diagnostic(), self.scx.get_mir(def_id),
-                                         || format!("Could not find MIR for closure: {:?}", def_id));
+                let mir = errors::expect(self.scx.sess().diagnostic(),
+                                         self.scx.get_mir(def_id),
+                                         || {
+                    format!("Could not find MIR for closure: {:?}", def_id)
+                });
 
                 let concrete_substs = monomorphize::apply_param_substs(self.scx.tcx(),
                                                                        self.param_substs,