Stim & cauterization fixes

OK, should all be working OK now.
Gets rid of double-coverage

Since Kevin stuck this fix already, my implementing it only gets in the
automerger's way.
Mutation fixes!