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