diff --git a/expr.cpp b/expr.cpp
index 53b07bdf..9f0d15e2 100644
--- a/expr.cpp
+++ b/expr.cpp
@@ -3203,6 +3203,7 @@ ConstExpr::ConstExpr(ConstExpr *old, double *v)
         break;
     case AtomicType::TYPE_INT64:
     case AtomicType::TYPE_UINT64:
+        // For now, this should never be reached 
         FATAL("fixme; we need another constructor so that we're not trying to pass "
                "double values to init an int64 type...");
     default:
diff --git a/module.cpp b/module.cpp
index 0c4b3a7c..b99c6c3b 100644
--- a/module.cpp
+++ b/module.cpp
@@ -665,19 +665,12 @@ lEmitFunctionCode(FunctionEmitContext *ctx, llvm::Function *function,
                 lCopyInTaskParameter(i, structParamPtr, decl, ctx);
 
         // Copy in the mask as well.
-        // FIXME: we may probably to check the mask at runtime and emit an
-        // 'all on' code path if it is all on, since that should be a
-        // common case.
-#if 1
         int nArgs = decl->functionArgs ? decl->functionArgs->size() : 0;
         // The mask is the last parameter in the argument structure
         llvm::Value *ptr = ctx->GetElementPtrInst(structParamPtr, 0, nArgs,
                                                   "task_struct_mask");
         llvm::Value *ptrval = ctx->LoadInst(ptr, NULL, "mask");
         ctx->SetEntryMask(ptrval);
-#else
-        Warning(funSym->pos, "Running task with all-on mask to start.");
-#endif
 
         // Copy threadIndex and threadCount into stack-allocated storage so
         // that their symbols point to something reasonable.