(m2m) Simplify a conditional block
(m2m) Fix compile error when used with llvm backend