grrrr Some cleanups related to mc.map and mc.op