Updates after feedback on MCDo::exec_ctxt(ctxt)