[[ RefactorSyntax ]] MCThere refactored. MCOr suffers the same issue as MCAnd