Our hacks were too eagerly clearning evil-mc's state. These changes will ensure that doesn't happen. Perhaps its time I package this up into a PR upstream? Fix: #6091